allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

pixfader: use parent's background color

Browse Source
This commit is contained in:
Robin Gareus
2014-08-30 04:16:18 +02:00
parent f5533213c0
commit 5a688b672c
2 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gtkmm2ext/gtkmm2ext/pixfader.h
View File

@@ -61,6 +61,7 @@ class LIBGTKMM2EXT_API PixFader : public Gtk::DrawingArea
void on_state_changed (Gtk::StateType); void on_state_changed (Gtk::StateType);
void on_style_changed (const Glib::RefPtr<Gtk::Style>&); void on_style_changed (const Glib::RefPtr<Gtk::Style>&);
Gdk::Color get_parent_bg ();
enum Orientation { enum Orientation {
VERT, VERT,
@@ -88,6 +89,9 @@ class LIBGTKMM2EXT_API PixFader : public Gtk::DrawingArea
float display_span (); float display_span ();
void set_adjustment_from_event (GdkEventButton *); void set_adjustment_from_event (GdkEventButton *);
void update_unity_position (); void update_unity_position ();
sigc::connection _parent_style_change;
Widget * _current_parent;
}; };

36
libs/gtkmm2ext/pixfader.cc
View File

@@ -46,6 +46,7 @@ PixFader::PixFader (Gtk::Adjustment& adj, int orientation, int fader_length, int
, _hovering (false) , _hovering (false)
, last_drawn (-1) , last_drawn (-1)
, dragging (false) , dragging (false)
, _current_parent (0)
{ {
bg_gradient = 0; bg_gradient = 0;
fg_gradient = 0; fg_gradient = 0;
@@ -75,15 +76,17 @@ PixFader::on_expose_event (GdkEventExpose* ev)
Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context(); Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context();
cairo_t* cr = context->cobj(); cairo_t* cr = context->cobj();
cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
cairo_clip_preserve (cr);
Gdk::Color fg_col = get_style()->get_fg (get_state()); Gdk::Color fg_col = get_style()->get_fg (get_state());
float ds = display_span (); float ds = display_span ();
float w = get_width(); float w = get_width();
float h = get_height(); float h = get_height();
//fill in the bg rect ... Gdk::Color bg (get_parent_bg());
Gdk::Color c = get_style()->get_bg (Gtk::STATE_PRELIGHT); //why prelight? Shouldn't we be using the parent's color? CairoWidget::set_source_rgb_a (cr, bg);
CairoWidget::set_source_rgb_a (cr, c);
cairo_rectangle (cr, 0, 0, w, h); cairo_rectangle (cr, 0, 0, w, h);
cairo_fill(cr); cairo_fill(cr);
@@ -539,3 +542,30 @@ PixFader::on_style_changed (const Glib::RefPtr<Gtk::Style>&)
queue_draw (); queue_draw ();
} }
Gdk::Color
PixFader::get_parent_bg ()
{
Widget* parent;
parent = get_parent ();
while (parent) {
if (!parent->get_has_window()) {
parent = parent->get_parent();
} else {
break;
}
}
if (parent && parent->get_has_window()) {
if (_current_parent != parent) {
if (_parent_style_change) _parent_style_change.disconnect();
_current_parent = parent;
_parent_style_change = parent->signal_style_changed().connect (mem_fun (*this, &PixFader::on_style_changed));
}
return parent->get_style ()->get_bg (parent->get_state());
}
return get_style ()->get_bg (get_state());
}