#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h"
+#ifdef check
+#undef check
+#endif
+
#include "gui_thread.h"
#include "splash.h"
std::string splash_file;
- if (!find_file_in_search_path (ardour_data_search_path(), "splash.png", splash_file)) {
+ if (!find_file (ardour_data_search_path(), "splash.png", splash_file)) {
cerr << "Cannot find splash screen image file\n";
throw failed_constructor();
}
the_splash = this;
expose_done = false;
+ expose_is_the_one = false;
ARDOUR::BootMessage.connect (msg_connection, invalidator (*this), boost::bind (&Splash::boot_message, this, _1), gui_context());
}
void
Splash::pop_back_for (Gtk::Window& win)
{
+#ifdef __APPLE__
+ /* April 2013: window layering on OS X is a bit different to X Window. at present,
+ the "restack()" functionality in GDK will only operate on windows in the same
+ "level" (e.g. two normal top level windows, or two utility windows) and will not
+ work across them. The splashscreen is on its own "StatusWindowLevel" so restacking
+ is not going to work.
+
+ So for OS X, we just hide ourselves.
+ */
+ (void) win;
+ hide();
+#else
set_keep_above (false);
get_window()->restack (win.get_window(), false);
- win.signal_hide().connect (sigc::mem_fun (*this, &Splash::pop_front));
+#endif
}
void
Splash::pop_front ()
{
+
+#ifdef __APPLE__
+ if (get_window()) {
+ show ();
+ }
+#else
set_keep_above (true);
+#endif
}
void
/* this must execute AFTER the GDK idle update mechanism
*/
- Glib::signal_idle().connect (sigc::mem_fun (this, &Splash::idle_after_expose),
- GDK_PRIORITY_REDRAW+2);
+ if (expose_is_the_one) {
+ Glib::signal_idle().connect (sigc::mem_fun (this, &Splash::idle_after_expose),
+ GDK_PRIORITY_REDRAW+2);
+ }
return true;
}
if (!was_mapped) {
expose_done = false;
- }
+ expose_is_the_one = false;
+ }
pop_front ();
present ();
while (!expose_done) {
gtk_main_iteration ();
}
+ gdk_display_flush (gdk_display_get_default());
}
}
str += Glib::Markup::escape_text (msg);
str += "</b>";
+ show ();
+
layout->set_markup (str);
Glib::RefPtr<Gdk::Window> win = darea.get_window();
-
+
if (win) {
expose_done = false;
- win->invalidate_rect (Gdk::Rectangle (0, darea.get_height() - 30, darea.get_width(), 30), true);
-
- while (!expose_done) {
- gtk_main_iteration ();
- }
+ if (win->is_visible ()) {
+ win->invalidate_rect (Gdk::Rectangle (0, darea.get_height() - 30, darea.get_width(), 30), true);
+ } else {
+ darea.queue_draw ();
+ }
}
}
+
+bool
+Splash::on_map_event (GdkEventAny* ev)
+{
+ expose_is_the_one = true;
+ return Window::on_map_event (ev);
+}