diff options
| -rw-r--r-- | libs/canvas/canvas.cc | 78 | ||||
| -rw-r--r-- | libs/canvas/canvas/canvas.h | 10 |
2 files changed, 46 insertions, 42 deletions
diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc index 85c87a39f0..975dcf84ef 100644 --- a/libs/canvas/canvas.cc +++ b/libs/canvas/canvas.cc @@ -35,6 +35,7 @@ #include "canvas/debug.h" #include "canvas/line.h" #include "canvas/scroll_group.h" +#include "canvas/utils.h" using namespace std; using namespace ArdourCanvas; @@ -44,6 +45,7 @@ uint32_t Canvas::tooltip_timeout_msecs = 750; /** Construct a new Canvas */ Canvas::Canvas () : _root (this) + , _bg_color (rgba_to_color (0, 1.0, 0.0, 1.0)) { set_epoch (); } @@ -341,6 +343,18 @@ Canvas::set_tooltip_timeout (uint32_t msecs) } void +Canvas::set_background_color (Color c) +{ + _bg_color = c; + + boost::optional<Rect> r = _root.bounding_box(); + + if (r) { + request_redraw (_root.item_to_window (r.get())); + } +} + +void GtkCanvas::re_enter () { DEBUG_TRACE (PBD::DEBUG::CanvasEnterLeave, "re-enter canvas by request\n"); @@ -743,47 +757,35 @@ GtkCanvas::on_expose_event (GdkEventExpose* ev) if (!canvas_image) { 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> window_context = get_window()->create_cairo_context (); +#else + Cairo::RefPtr<Cairo::Context> draw_context = get_window()->create_cairo_context (); +#endif - { - /* scope for image_context */ - Cairo::RefPtr<Cairo::Context> image_context = Cairo::Context::create (canvas_image); - - /* clear expose area */ - - image_context->save (); - image_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); - image_context->clip (); - image_context->set_operator (Cairo::OPERATOR_SOURCE); - // TODO get canvas backround see CairoWidget::get_parent_bg - // also subscribe to parent's signal_style_changed() - // ..until new canvas color-theme API is in place, hardcode some values. - image_context->set_source_rgba (84./255., 85./255., 93./255., 1.0); - image_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); - image_context->fill (); - image_context->restore (); - - /* render into image surface */ - - render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), image_context); - - /* image surface is flushed when image_context goes out of scope */ - } - + /* draw background color */ + + draw_context->save (); + draw_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); + draw_context->clip (); + draw_context->set_operator (Cairo::OPERATOR_SOURCE); + set_source_rgba (draw_context, _bg_color); + draw_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); + draw_context->fill (); + draw_context->restore (); + + /* render canvas */ + + render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), draw_context); + +#ifdef USE_CAIRO_IMAGE_SURFACE_FOR_GTK_CANVAS /* now blit our private surface back to the GDK one */ - Cairo::RefPtr<Cairo::Context> cairo_context = get_window()->create_cairo_context (); - - cairo_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); - cairo_context->clip (); - cairo_context->set_source (canvas_image, 0, 0); - cairo_context->set_operator (Cairo::OPERATOR_SOURCE); - cairo_context->paint (); - -#else - - Cairo::RefPtr<Cairo::Context> cairo_context = get_window()->create_cairo_context (); - render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), cairo_context); - + window_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); + window_context->clip (); + window_context->set_source (canvas_image, 0, 0); + window_context->set_operator (Cairo::OPERATOR_SOURCE); + window_context->paint (); #endif return true; diff --git a/libs/canvas/canvas/canvas.h b/libs/canvas/canvas/canvas.h index 107ea0d7b2..a764e6ee8a 100644 --- a/libs/canvas/canvas/canvas.h +++ b/libs/canvas/canvas/canvas.h @@ -87,6 +87,9 @@ public: return &_root; } + void set_background_color (ArdourCanvas::Color); + ArdourCanvas::Color background_color() const { return _bg_color; } + /** Called when an item is being destroyed */ virtual void item_going_away (Item *, boost::optional<Rect>) {} void item_shown_or_hidden (Item *); @@ -152,13 +155,12 @@ public: static void set_tooltip_timeout (uint32_t msecs); protected: - void queue_draw_item_area (Item *, Rect); - - /** our root item */ - Root _root; + Root _root; + Color _bg_color; static uint32_t tooltip_timeout_msecs; + void queue_draw_item_area (Item *, Rect); virtual void pick_current_item (int state) = 0; virtual void pick_current_item (Duple const &, int state) = 0; |