diff options
author | Robin Gareus <robin@gareus.org> | 2014-03-20 23:50:40 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2014-03-20 23:50:40 +0100 |
commit | ab44e41dfd8b8247ed5f57a8f3fcbbf4f8457827 (patch) | |
tree | 63e956159ece10dc3c33340c7004a8d95a7ba8df /libs | |
parent | 9df3157dfc59c596bf8f044fc4ab5445a12f02a1 (diff) |
change the meters into CairoWidget, add expose_area to CairoWidget::render()
Diffstat (limited to 'libs')
-rw-r--r-- | libs/gtkmm2ext/cairo_widget.cc | 8 | ||||
-rw-r--r-- | libs/gtkmm2ext/fastmeter.cc | 60 | ||||
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/cairo_widget.h | 2 | ||||
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/fastmeter.h | 11 |
4 files changed, 39 insertions, 42 deletions
diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc index 70c52bf177..b7d9b08c72 100644 --- a/libs/gtkmm2ext/cairo_widget.cc +++ b/libs/gtkmm2ext/cairo_widget.cc @@ -53,7 +53,13 @@ CairoWidget::on_expose_event (GdkEventExpose *ev) cairo_set_source_rgb (cr, bg.get_red_p(), bg.get_green_p(), bg.get_blue_p()); cairo_fill (cr); - render (cr); + cairo_rectangle_t expose_area; + expose_area.x = ev->area.x; + expose_area.y = ev->area.y; + expose_area.width = ev->area.width; + expose_area.height = ev->area.height; + + render (cr, &expose_area); cairo_destroy (cr); diff --git a/libs/gtkmm2ext/fastmeter.cc b/libs/gtkmm2ext/fastmeter.cc index 5a77557222..15963df79b 100644 --- a/libs/gtkmm2ext/fastmeter.cc +++ b/libs/gtkmm2ext/fastmeter.cc @@ -504,7 +504,7 @@ FastMeter::vertical_size_allocate (Gtk::Allocation &alloc) pixwidth = request_width - 2; } - DrawingArea::on_size_allocate (alloc); + CairoWidget::on_size_allocate (alloc); } void @@ -529,31 +529,26 @@ FastMeter::horizontal_size_allocate (Gtk::Allocation &alloc) pixheight = request_height - 2; } - DrawingArea::on_size_allocate (alloc); + CairoWidget::on_size_allocate (alloc); } -bool -FastMeter::on_expose_event (GdkEventExpose* ev) +void +FastMeter::render (cairo_t* cr, cairo_rectangle_t* area) { if (orientation == Vertical) { - return vertical_expose (ev); + return vertical_expose (cr, area); } else { - return horizontal_expose (ev); + return horizontal_expose (cr, area); } } -bool -FastMeter::vertical_expose (GdkEventExpose* ev) +void +FastMeter::vertical_expose (cairo_t* cr, cairo_rectangle_t* area) { - Glib::RefPtr<Gdk::Window> win = get_window (); gint top_of_meter; GdkRectangle intersection; GdkRectangle background; - - cairo_t* cr = gdk_cairo_create (get_window ()->gobj()); - - cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height); - cairo_clip (cr); + GdkRectangle eventarea; cairo_set_source_rgb (cr, 0, 0, 0); // black rounded_rectangle (cr, 0, 0, pixwidth + 2, pixheight + 2, 2); @@ -572,13 +567,18 @@ FastMeter::vertical_expose (GdkEventExpose* ev) background.width = pixrect.width; background.height = pixheight - top_of_meter; - if (gdk_rectangle_intersect (&background, &ev->area, &intersection)) { + eventarea.x = area->x; + eventarea.y = area->y; + eventarea.width = area->width; + eventarea.height = area->height; + + if (gdk_rectangle_intersect (&background, &eventarea, &intersection)) { cairo_set_source (cr, bgpattern->cobj()); cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height); cairo_fill (cr); } - if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) { + if (gdk_rectangle_intersect (&pixrect, &eventarea, &intersection)) { // draw the part of the meter image that we need. the area we draw is bounded "in reverse" (top->bottom) cairo_set_source (cr, fgpattern->cobj()); cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height); @@ -610,24 +610,15 @@ FastMeter::vertical_expose (GdkEventExpose* ev) last_peak_rect.width = 0; last_peak_rect.height = 0; } - - cairo_destroy (cr); - - return TRUE; } -bool -FastMeter::horizontal_expose (GdkEventExpose* ev) +void +FastMeter::horizontal_expose (cairo_t* cr, cairo_rectangle_t* area) { - Glib::RefPtr<Gdk::Window> win = get_window (); gint right_of_meter; GdkRectangle intersection; GdkRectangle background; - - cairo_t* cr = gdk_cairo_create (get_window ()->gobj()); - - cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height); - cairo_clip (cr); + GdkRectangle eventarea; cairo_set_source_rgb (cr, 0, 0, 0); // black rounded_rectangle (cr, 0, 0, pixwidth + 2, pixheight + 2, 2); @@ -645,13 +636,18 @@ FastMeter::horizontal_expose (GdkEventExpose* ev) background.width = pixwidth - right_of_meter; background.height = pixheight; - if (gdk_rectangle_intersect (&background, &ev->area, &intersection)) { + eventarea.x = area->x; + eventarea.y = area->y; + eventarea.width = area->width; + eventarea.height = area->height; + + if (gdk_rectangle_intersect (&background, &eventarea, &intersection)) { cairo_set_source (cr, bgpattern->cobj()); cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height); cairo_fill (cr); } - if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) { + if (gdk_rectangle_intersect (&pixrect, &eventarea, &intersection)) { cairo_set_source (cr, fgpattern->cobj()); cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height); cairo_fill (cr); @@ -683,10 +679,6 @@ FastMeter::horizontal_expose (GdkEventExpose* ev) last_peak_rect.width = 0; last_peak_rect.height = 0; } - - cairo_destroy (cr); - - return TRUE; } void diff --git a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h index c8927b050b..2c70f8aad2 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h @@ -69,7 +69,7 @@ public: protected: /** Render the widget to the given Cairo context */ - virtual void render (cairo_t *) = 0; + virtual void render (cairo_t *, cairo_rectangle_t*) = 0; virtual bool on_expose_event (GdkEventExpose *); void on_size_allocate (Gtk::Allocation &); void on_state_changed (Gtk::StateType); diff --git a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h index 6802481777..650908f6a4 100644 --- a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h +++ b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h @@ -24,14 +24,13 @@ #include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple_comparison.hpp> #include <cairomm/pattern.h> -#include <gtkmm/drawingarea.h> -#include <gdkmm/pixbuf.h> +#include "gtkmm2ext/cairo_widget.h" #include "gtkmm2ext/visibility.h" namespace Gtkmm2ext { -class LIBGTKMM2EXT_API FastMeter : public Gtk::DrawingArea { +class LIBGTKMM2EXT_API FastMeter : public CairoWidget { public: enum Orientation { Horizontal, @@ -67,7 +66,7 @@ class LIBGTKMM2EXT_API FastMeter : public Gtk::DrawingArea { bool get_highlight () { return highlight; } protected: - bool on_expose_event (GdkEventExpose*); + void render (cairo_t *, cairo_rectangle_t*); void on_size_request (GtkRequisition*); void on_size_allocate (Gtk::Allocation&); private: @@ -96,12 +95,12 @@ private: float current_user_level; bool highlight; - bool vertical_expose (GdkEventExpose*); + void vertical_expose (cairo_t*, cairo_rectangle_t*); void vertical_size_request (GtkRequisition*); void vertical_size_allocate (Gtk::Allocation&); void queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>&, float); - bool horizontal_expose (GdkEventExpose*); + void horizontal_expose (cairo_t*, cairo_rectangle_t*); void horizontal_size_request (GtkRequisition*); void horizontal_size_allocate (Gtk::Allocation&); void queue_horizontal_redraw (const Glib::RefPtr<Gdk::Window>&, float); |