diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-01-03 07:06:57 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-01-03 07:06:57 +0000 |
commit | 6481d09cdc90e6bc8462b322c2c4cbecd5efc39b (patch) | |
tree | 6a872353d3c959df9bb5e691277767f439478943 /libs/gtkmm2ext/fastmeter.cc | |
parent | e829e4d936614a551ea492dcc2b32b9e4858084c (diff) |
make meters work properly (and very slightly faster)
git-svn-id: svn://localhost/trunk/ardour2@230 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/fastmeter.cc')
-rw-r--r-- | libs/gtkmm2ext/fastmeter.cc | 60 |
1 files changed, 27 insertions, 33 deletions
diff --git a/libs/gtkmm2ext/fastmeter.cc b/libs/gtkmm2ext/fastmeter.cc index 5067bf5c16..245a189c62 100644 --- a/libs/gtkmm2ext/fastmeter.cc +++ b/libs/gtkmm2ext/fastmeter.cc @@ -52,19 +52,19 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o) set_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK); - pixrect.set_x(0); - pixrect.set_y(0); + pixrect.x = 0; + pixrect.y = 0; if (orientation == Vertical) { - pixrect.set_width(min (v_pixwidth, (gint) dimen)); - pixrect.set_height(v_pixheight); + pixrect.width = min (v_pixwidth, (gint) dimen); + pixrect.height = v_pixheight; } else { - pixrect.set_width(h_pixwidth); - pixrect.set_height(min (h_pixheight, (gint) dimen)); + pixrect.width = h_pixwidth; + pixrect.height = min (h_pixheight, (gint) dimen); } - request_width = pixrect.get_width(); - request_height= pixrect.get_height(); + request_width = pixrect.width; + request_height= pixrect.height; } FastMeter::~FastMeter () @@ -147,26 +147,21 @@ FastMeter::on_expose_event (GdkEventExpose* ev) bool FastMeter::vertical_expose (GdkEventExpose* ev) { - Rectangle intersect; gint top_of_meter; - bool blit = false; - bool intersecting = false; + GdkRectangle intersection; top_of_meter = (gint) floor (v_pixheight * current_level); - pixrect.set_height(top_of_meter); + pixrect.height = top_of_meter; - intersect = pixrect.intersect(wrap(&ev->area), intersecting); - if (intersecting) { + if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) { /* draw the part of the meter image that we need. the area we draw is bounded "in reverse" (top->bottom) */ RefPtr<Gdk::Window> win(get_window()); win->draw_drawable(get_style()->get_fg_gc(get_state()), v_pixmap, - intersect.get_x(), v_pixheight - top_of_meter, - intersect.get_x(), v_pixheight - top_of_meter, - intersect.get_width(), intersect.get_height()); - - blit = true; + intersection.x, v_pixheight - top_of_meter, + intersection.x, v_pixheight - top_of_meter, + intersection.width, intersection.height); } /* draw peak bar */ @@ -174,9 +169,9 @@ FastMeter::vertical_expose (GdkEventExpose* ev) if (hold_state) { RefPtr<Gdk::Window> win(get_window()); win->draw_drawable(get_style()->get_fg_gc(get_state()), v_pixmap, - intersect.get_x(), v_pixheight - (gint) floor (v_pixheight * current_peak), - intersect.get_x(), v_pixheight - (gint) floor (v_pixheight * current_peak), - intersect.get_width(), 3); + intersection.x, v_pixheight - (gint) floor (v_pixheight * current_peak), + intersection.x, v_pixheight - (gint) floor (v_pixheight * current_peak), + intersection.width, 3); } return true; @@ -185,23 +180,22 @@ FastMeter::vertical_expose (GdkEventExpose* ev) bool FastMeter::horizontal_expose (GdkEventExpose* ev) { - Rectangle intersect; - bool intersecting = false; + GdkRectangle intersection; gint right_of_meter; right_of_meter = (gint) floor (h_pixwidth * current_level); - pixrect.set_width(right_of_meter); + pixrect.width = right_of_meter; + + if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) { - intersect = pixrect.intersect(wrap(&ev->area), intersecting); - if (intersecting) { /* draw the part of the meter image that we need. */ RefPtr<Gdk::Window> win(get_window()); win->draw_drawable(get_style()->get_fg_gc(get_state()), h_pixmap, - intersect.get_x(), intersect.get_y(), - intersect.get_x(), intersect.get_y(), - intersect.get_width(), intersect.get_height()); + intersection.x, intersection.y, + intersection.x, intersection.y, + intersection.width, intersection.height); } /* draw peak bar */ @@ -209,9 +203,9 @@ FastMeter::horizontal_expose (GdkEventExpose* ev) if (hold_state) { RefPtr<Gdk::Window> win(get_window()); win->draw_drawable(get_style()->get_fg_gc(get_state()), h_pixmap, - right_of_meter, intersect.get_y(), - right_of_meter, intersect.get_y(), - 3, intersect.get_height()); + right_of_meter, intersection.y, + right_of_meter, intersection.y, + 3, intersection.height); } return true; |