Merge with 2.0-ongoing R2943.

git-svn-id: svn://localhost/ardour2/branches/3.0@2944 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 37 insertions, 6 deletions

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index eee108c70b..7f38c39588 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -30,25 +30,39 @@ Splash::Splash ()
 		throw failed_constructor();
 	}
 	
-	set_size_request (pixbuf->get_width(), pixbuf->get_height());
+	darea.set_size_request (pixbuf->get_width(), pixbuf->get_height());
 	set_type_hint (Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
 	set_keep_above (true);
 	set_position (WIN_POS_CENTER);
-	add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+	darea.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+
+	layout = create_pango_layout ("");
+
+	darea.show ();
+	darea.signal_expose_event().connect (mem_fun (*this, &Splash::expose));
+
+	add (darea);
+}
+
+void
+Splash::on_realize ()
+{
+	Window::on_realize ();
+	layout->set_font_description (get_style()->get_font());
 }
 
+
 bool
 Splash::on_button_release_event (GdkEventButton* ev)
 {
 	hide ();
+	return true;
 }
 
 bool
-Splash::on_expose_event (GdkEventExpose* ev)
+Splash::expose (GdkEventExpose* ev)
 {
-	RefPtr<Gdk::Window> window = get_window();
-
-	Window::on_expose_event (ev);
+	RefPtr<Gdk::Window> window = darea.get_window();
 
 	window->draw_pixbuf (get_style()->get_bg_gc (STATE_NORMAL), pixbuf,
 			     ev->area.x, ev->area.y,
@@ -56,5 +70,22 @@ Splash::on_expose_event (GdkEventExpose* ev)
 			     ev->area.width, ev->area.height,
 			     Gdk::RGB_DITHER_NONE, 0, 0);
 
+	Glib::RefPtr<Gtk::Style> style = darea.get_style();
+	Glib::RefPtr<Gdk::GC> white = style->get_white_gc();
+
+	window->draw_layout (white, 10, pixbuf->get_height() - 30, layout);
+
 	return true;
 }
+
+void
+Splash::message (const string& msg)
+{
+	string str ("<b>");
+	str += msg;
+	str += "</b>";
+
+	layout->set_markup (str);
+	darea.queue_draw ();
+	get_window()->process_updates (true);
+}