ardour/livetrax
13
0
Fork 0
Code

NO-OP: whitespace

Browse Source
This commit is contained in:
Robin Gareus 2017-03-17 16:03:59 +01:00
parent 51d43c6e14
commit 86ac64d528
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libs/canvas/canvas.cc
View File

@ -52,7 +52,7 @@ uint32_t Canvas::tooltip_timeout_msecs = 750;
/** Construct a new Canvas */ /** Construct a new Canvas */
Canvas::Canvas () Canvas::Canvas ()
: _root (this) : _root (this)
, _bg_color (rgba_to_color (0, 1.0, 0.0, 1.0)) , _bg_color (rgba_to_color (0, 1.0, 0.0, 1.0))
{ {
set_epoch (); set_epoch ();
} }
@ -363,13 +363,13 @@ Canvas::set_tooltip_timeout (uint32_t msecs)
void void
Canvas::set_background_color (Color c) Canvas::set_background_color (Color c)
{ {
_bg_color = c; _bg_color = c;
Rect r = _root.bounding_box(); Rect r = _root.bounding_box();
if (r) { if (r) {
request_redraw (_root.item_to_window (r)); request_redraw (_root.item_to_window (r));
} }
} }
void void
@ -800,47 +800,47 @@ GtkCanvas::on_expose_event (GdkEventExpose* ev)
if (!canvas_image) { if (!canvas_image) {
canvas_image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, get_width(), get_height()); canvas_image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, get_width(), get_height());
} }
Cairo::RefPtr<Cairo::Context> draw_context = Cairo::Context::create (canvas_image); Cairo::RefPtr<Cairo::Context> draw_context = Cairo::Context::create (canvas_image);
Cairo::RefPtr<Cairo::Context> window_context = get_window()->create_cairo_context (); Cairo::RefPtr<Cairo::Context> window_context = get_window()->create_cairo_context ();
#else #else
Cairo::RefPtr<Cairo::Context> draw_context = get_window()->create_cairo_context (); Cairo::RefPtr<Cairo::Context> draw_context = get_window()->create_cairo_context ();
#endif #endif
/* draw background color */ /* draw background color */
draw_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); draw_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height);
draw_context->clip_preserve (); draw_context->clip_preserve ();
set_source_rgba (draw_context, _bg_color); set_source_rgba (draw_context, _bg_color);
draw_context->fill (); draw_context->fill ();
/* render canvas */ /* render canvas */
if ( _single_exposure ) { if ( _single_exposure ) {
render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), draw_context); render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), draw_context);
} else { } else {
GdkRectangle* rects; GdkRectangle* rects;
gint nrects; gint nrects;
gdk_region_get_rectangles (ev->region, &rects, &nrects); gdk_region_get_rectangles (ev->region, &rects, &nrects);
for (gint n = 0; n < nrects; ++n) { for (gint n = 0; n < nrects; ++n) {
draw_context->set_identity_matrix(); //reset the cairo matrix, just in case someone left it transformed after drawing ( cough ) draw_context->set_identity_matrix(); //reset the cairo matrix, just in case someone left it transformed after drawing ( cough )
render (Rect (rects[n].x, rects[n].y, rects[n].x + rects[n].width, rects[n].y + rects[n].height), draw_context); render (Rect (rects[n].x, rects[n].y, rects[n].x + rects[n].width, rects[n].y + rects[n].height), draw_context);
}
g_free (rects);
} }
g_free (rects);
}
#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE #ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
if (getenv("ARDOUR_IMAGE_SURFACE")) { if (getenv("ARDOUR_IMAGE_SURFACE")) {
#endif #endif
#if defined USE_CAIRO_IMAGE_SURFACE || defined OPTIONAL_CAIRO_IMAGE_SURFACE #if defined USE_CAIRO_IMAGE_SURFACE || defined OPTIONAL_CAIRO_IMAGE_SURFACE
/* now blit our private surface back to the GDK one */ /* now blit our private surface back to the GDK one */
window_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); window_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height);
window_context->clip (); window_context->clip ();
window_context->set_source (canvas_image, 0, 0); window_context->set_source (canvas_image, 0, 0);
window_context->set_operator (Cairo::OPERATOR_SOURCE); window_context->set_operator (Cairo::OPERATOR_SOURCE);
window_context->paint (); window_context->paint ();
#endif #endif
#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE #ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
} }