#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h"
+#include "gtkmm2ext/utils.h"
+
#ifdef check
#undef check
#endif
Splash::Splash ()
{
assert (the_splash == 0);
-
+
std::string splash_file;
- if (!find_file_in_search_path (ardour_data_search_path(), "splash.png", splash_file)) {
+ Searchpath rc (ARDOUR::ardour_data_search_path());
+ rc.add_subdirectory_to_paths ("resources");
+
+ if (!find_file (rc, PROGRAM_NAME "-splash.png", splash_file)) {
cerr << "Cannot find splash screen image file\n";
throw failed_constructor();
}
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
- work across them. The splashscreen is on its own "StatusWindowLevel" so restacking
+ 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.
+
+ 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();
Splash::pop_front ()
{
-#ifdef __APPLE__
+#if defined __APPLE__ || defined PLATFORM_WINDOWS
if (get_window()) {
show ();
}
-#else
- set_keep_above (true);
#endif
}
Splash::on_button_release_event (GdkEventButton* ev)
{
RefPtr<Gdk::Window> window = get_window();
-
+
if (!window || ev->window != window->gobj()) {
return false;
}
-
+
hide ();
return true;
}
window->draw_layout (white, 10, pixbuf->get_height() - 30, layout);
- /* this must execute AFTER the GDK idle update mechanism
+ /* this must execute AFTER the GDK idle update mechanism
*/
-
+
if (expose_is_the_one) {
Glib::signal_idle().connect (sigc::mem_fun (this, &Splash::idle_after_expose),
GDK_PRIORITY_REDRAW+2);
Splash::display ()
{
bool was_mapped = is_mapped ();
-
+
if (!was_mapped) {
expose_done = false;
expose_is_the_one = false;
- }
+ }
pop_front ();
present ();
-
+
if (!was_mapped) {
while (!expose_done) {
gtk_main_iteration ();
Splash::message (const string& msg)
{
string str ("<b>");
- str += Glib::Markup::escape_text (msg);
+ str += Gtkmm2ext::markup_escape_text (msg);
str += "</b>";
+ show ();
+
layout->set_markup (str);
Glib::RefPtr<Gdk::Window> win = darea.get_window();
-
+
if (win) {
expose_done = false;
} else {
darea.queue_draw ();
}
-
- while (!expose_done) {
- if(gtk_main_iteration ()) return; // quit was called
- }
- gdk_display_flush (gdk_display_get_default());
}
}