Merge with 2.0-ongoing R2943.

[ardour.git] / gtk2_ardour / splash.cc

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index eee108c70b5da126feb4ca15003eedddd76208bd..7f38c39588a94d4e0147a9eb25bebbab6841299d 100644 (file)
--- 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);
+}