ardour/livetrax
13
0
Fork 0
Code

patch/fix for crash when pixfader is exposed after being allocated only 1xN or Nx1 pixels

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13986 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2013-01-24 13:15:20 +00:00
parent ba602ea01a
commit 60a40dfaef
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/gtkmm2ext/pixfader.cc
View File

@ -188,13 +188,35 @@ 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 (cr);
if (!pattern) { if (!pattern) {
create_patterns(); create_patterns();
} }
if (!pattern) {
/* this isn't supposed to be happen, but some wackiness whereby
the pixfader ends up with a 1xN or Nx1 size allocation
leads to it. the basic wackiness needs fixing but we
shouldn't crash. just fill in the expose area with
our bg color.
*/
Gdk::Color c = get_style()->get_bg (get_state());
float br, bg, bb;
br = c.get_red_p ();
bg = c.get_green_p ();
bb = c.get_blue_p ();
cairo_set_source_rgb (cr, br, bg, bb);
cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
cairo_fill (cr);
return true;
}
cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
cairo_clip (cr);
int ds = display_span (); int ds = display_span ();
float w = get_width(); float w = get_width();
float h = get_height(); float h = get_height();