X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsplash.cc;h=409749d0628c06f78c2cfc26b8223ea707be3df5;hb=95df99e6d4cf6d1f8d71183299d31835e6708eb8;hp=ee0566a9100f6d94653456316830ed87806fafb9;hpb=25a6296f865620d5013cd634e693f7179e7edc84;p=ardour.git
diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index ee0566a910..409749d062 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -48,7 +48,7 @@ Splash::Splash ()
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();
}
@@ -100,7 +100,7 @@ Splash::~Splash ()
void
Splash::pop_back_for (Gtk::Window& win)
{
-#ifdef __APPLE__
+#if defined __APPLE__ || defined PLATFORM_WINDOWS
/* 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
@@ -108,6 +108,10 @@ Splash::pop_back_for (Gtk::Window& win)
is not going to work.
So for OS X, we just hide ourselves.
+
+ Oct 2014: The Windows situation is similar, although it should be possible
+ to play tricks with gdk's set_type_hint() or directly hack things using
+ SetWindowLong() and UpdateLayeredWindow()
*/
(void) win;
hide();
@@ -121,12 +125,10 @@ void
Splash::pop_front ()
{
-#ifdef __APPLE__
+#if defined __APPLE__ || defined PLATFORM_WINDOWS
if (get_window()) {
show ();
}
-#else
- set_keep_above (true);
#endif
}
@@ -221,9 +223,11 @@ void
Splash::message (const string& msg)
{
string str ("");
- str += Glib::Markup::escape_text (msg);
+ str += Glib::Markup::escape_text (msg).c_str();
str += "";
+ show ();
+
layout->set_markup (str);
Glib::RefPtr win = darea.get_window();
@@ -235,11 +239,6 @@ Splash::message (const string& msg)
} else {
darea.queue_draw ();
}
-
- while (!expose_done) {
- if(gtk_main_iteration ()) return; // quit was called
- }
- gdk_display_flush (gdk_display_get_default());
}
}