diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-11-11 16:03:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-11-11 16:03:37 +0000 |
| commit | a57f4ead2d73c5eed355f4bf51ad912e30fe09f7 (patch) | |
| tree | b14d0a04b724dcf878317a860088b87bdae190e3 /libs/gtkmm2ext/cairo_packer.cc | |
| parent | 78e092e0a34756f0c2f427b16d1ef364992b4846 (diff) | |
make Cairo{HV}Packer fetch bg information from a style file, rather than hard-code it
git-svn-id: svn://localhost/ardour2/branches/3.0@13433 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/cairo_packer.cc')
| -rw-r--r-- | libs/gtkmm2ext/cairo_packer.cc | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/libs/gtkmm2ext/cairo_packer.cc b/libs/gtkmm2ext/cairo_packer.cc index 6145f7dd50..822f943939 100644 --- a/libs/gtkmm2ext/cairo_packer.cc +++ b/libs/gtkmm2ext/cairo_packer.cc @@ -13,7 +13,10 @@ CairoPacker::draw_background (Gtk::Widget& w, GdkEventExpose*) Cairo::RefPtr<Cairo::Context> context = win->create_cairo_context(); w.translate_coordinates (*window_parent, 0, 0, x, y); - context->set_source_rgba (0.149, 0.149, 0.149, 1.0); + + Gdk::Color bg = get_bg (); + + context->set_source_rgba (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p(), 1.0); Gtkmm2ext::rounded_rectangle (context, x, y, w.get_allocation().get_width(), w.get_allocation().get_height(), 9); context->fill (); } @@ -21,13 +24,19 @@ CairoPacker::draw_background (Gtk::Widget& w, GdkEventExpose*) CairoHPacker::CairoHPacker () { - Gdk::Color bg; +} - bg.set_red (lrint (0.149 * 65535)); - bg.set_green (lrint (0.149 * 65535)); - bg.set_blue (lrint (0.149 * 65535)); +void +CairoHPacker::on_realize () +{ + HBox::on_realize (); + CairoWidget::provide_background_for_cairo_widget (*this, get_bg ()); +} - CairoWidget::provide_background_for_cairo_widget (*this, bg); +Gdk::Color +CairoHPacker::get_bg () const +{ + return get_style()->get_bg (Gtk::STATE_NORMAL); } bool @@ -39,13 +48,6 @@ CairoHPacker::on_expose_event (GdkEventExpose* ev) CairoVPacker::CairoVPacker () { - Gdk::Color bg; - - bg.set_red (lrint (0.149 * 65535)); - bg.set_green (lrint (0.149 * 65535)); - bg.set_blue (lrint (0.149 * 65535)); - - CairoWidget::provide_background_for_cairo_widget (*this, bg); } bool @@ -54,3 +56,16 @@ CairoVPacker::on_expose_event (GdkEventExpose* ev) draw_background (*this, ev); return VBox::on_expose_event (ev); } + +void +CairoVPacker::on_realize () +{ + VBox::on_realize (); + CairoWidget::provide_background_for_cairo_widget (*this, get_bg()); +} + +Gdk::Color +CairoVPacker::get_bg () const +{ + return get_style()->get_bg (Gtk::STATE_NORMAL); +} |