diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-07-23 08:42:05 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:22 -0500 |
commit | 8c54142734a03df7526be1d5feb29282fb248329 (patch) | |
tree | ba28cb01eef759b25b977c163657473dc0a8cc6f /gtk2_ardour | |
parent | 90845af8fa89101b53761d6c1843c3d0daa87119 (diff) |
hide splash in a sensible and understandable way
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 13 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 16 |
2 files changed, 13 insertions, 16 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index bd2b437c2b..1b6f5eaf6d 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -859,6 +859,13 @@ ARDOUR_UI::check_announcements () #endif } +static bool +_hide_splash (gpointer arg) +{ + ((ARDOUR_UI*)arg)->hide_splash(); + return false; +} + int ARDOUR_UI::starting () { @@ -1039,6 +1046,12 @@ ARDOUR_UI::starting () _status_bar_visibility.update (); BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME)); + + if (splash && splash->is_visible()) { + // in 1 second, hide the splash screen + Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000); + } + return 0; } diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 08174a62bc..b0beeb50af 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -326,13 +326,6 @@ ARDOUR_UI::unload_session (bool hide_stuff) return 0; } -static bool -_hide_splash (gpointer arg) -{ - ((ARDOUR_UI*)arg)->hide_splash(); - return false; -} - void ARDOUR_UI::show_tabbable (Tabbable* t) { @@ -340,11 +333,6 @@ ARDOUR_UI::show_tabbable (Tabbable* t) return; } - if (splash && splash->is_visible()) { - // in 2 seconds, hide the splash screen - Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 2000); - } - t->make_visible (); } @@ -363,10 +351,6 @@ ARDOUR_UI::attach_tabbable (Tabbable* t) if (!t) { return; } - if (splash && splash->is_visible()) { - // in 2 seconds, hide the splash screen - Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 2000); - } t->attach (); } |