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

if color property is not yet set, don't render

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10915 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-12-06 21:58:41 +00:00
parent 0bed168827
commit d29fe416da
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/gtkmm2ext/cell_renderer_color_selector.cc
View File

@ -63,28 +63,33 @@ CellRendererColorSelector::property_color()
void void
CellRendererColorSelector::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& /*widget*/, const Gdk::Rectangle& /*background_area*/, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState /*flags*/) CellRendererColorSelector::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& /*widget*/, const Gdk::Rectangle& /*background_area*/, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState /*flags*/)
{ {
cairo_t* cr = gdk_cairo_create (window->gobj());
double r, g, b;
Gdk::Color c = _property_color.get_value(); Gdk::Color c = _property_color.get_value();
cairo_rectangle (cr, expose_area.get_x(), expose_area.get_y(), expose_area.get_width(), expose_area.get_height()); if (c.gobj() != 0) {
cairo_clip (cr);
r = c.get_red_p(); cairo_t* cr = gdk_cairo_create (window->gobj());
g = c.get_green_p(); double r, g, b;
b = c.get_blue_p(); Gdk::Color c = _property_color.get_value();
cairo_rectangle_t drawing_rect; cairo_rectangle (cr, expose_area.get_x(), expose_area.get_y(), expose_area.get_width(), expose_area.get_height());
cairo_clip (cr);
drawing_rect.x = cell_area.get_x() + property_xpad(); r = c.get_red_p();
drawing_rect.y = cell_area.get_y() + property_ypad(); g = c.get_green_p();
drawing_rect.width = cell_area.get_width() - (2 * property_xpad()); b = c.get_blue_p();
drawing_rect.height = cell_area.get_height() - (2 * property_ypad());
Gtkmm2ext::rounded_rectangle (cr, drawing_rect.x, drawing_rect.y, drawing_rect.width, drawing_rect.height, 5); cairo_rectangle_t drawing_rect;
cairo_set_source_rgb (cr, r, g, b);
cairo_fill (cr);
cairo_destroy (cr); drawing_rect.x = cell_area.get_x() + property_xpad();
drawing_rect.y = cell_area.get_y() + property_ypad();
drawing_rect.width = cell_area.get_width() - (2 * property_xpad());
drawing_rect.height = cell_area.get_height() - (2 * property_ypad());
Gtkmm2ext::rounded_rectangle (cr, drawing_rect.x, drawing_rect.y, drawing_rect.width, drawing_rect.height, 5);
cairo_set_source_rgb (cr, r, g, b);
cairo_fill (cr);
cairo_destroy (cr);
}
} }