ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

make Cairo{HV}Packer fetch bg information from a style file, rather than hard-code it

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13433 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-11-11 16:03:37 +00:00
parent 78e092e0a3
commit a57f4ead2d
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libs/gtkmm2ext/cairo_packer.cc
View File

@ -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);
}

8
libs/gtkmm2ext/gtkmm2ext/cairo_packer.h
View File

@ -9,6 +9,8 @@ class CairoPacker
CairoPacker () {}
virtual ~CairoPacker () {}
virtual Gdk::Color get_bg () const = 0;
protected:
virtual void draw_background (Gtk::Widget&, GdkEventExpose*);
};
@ -19,7 +21,10 @@ class CairoHPacker : public CairoPacker, public Gtk::HBox
CairoHPacker ();
~CairoHPacker() {}
Gdk::Color get_bg () const;
bool on_expose_event (GdkEventExpose*);
void on_realize ();
};
class CairoVPacker : public CairoPacker, public Gtk::VBox
@ -28,7 +33,10 @@ class CairoVPacker : public CairoPacker, public Gtk::VBox
CairoVPacker ();
~CairoVPacker () {}
Gdk::Color get_bg () const;
bool on_expose_event (GdkEventExpose*);
void on_realize ();
};
#endif /* __gtkmm2ext_cairo_packer_h__ */