mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-08 07:45:00 +01:00
Merge with 2.0-ongoing R2885.
git-svn-id: svn://localhost/ardour2/trunk@2886 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
8a2e30816e
commit
821e4763fd
2 changed files with 9 additions and 4 deletions
|
|
@ -351,7 +351,12 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
|
|||
GdkRectangle background;
|
||||
|
||||
top_of_meter = (gint) floor (pixheight * current_level);
|
||||
|
||||
/* reset the height & origin of the rect that needs to show the pixbuf
|
||||
*/
|
||||
|
||||
pixrect.height = top_of_meter;
|
||||
pixrect.y = pixheight - top_of_meter;
|
||||
|
||||
background.x = 0;
|
||||
background.y = 0;
|
||||
|
|
@ -367,8 +372,8 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
|
|||
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)
|
||||
get_window()->draw_pixbuf(get_style()->get_fg_gc(get_state()), pixbuf,
|
||||
intersection.x, pixheight - top_of_meter,
|
||||
intersection.x, pixheight - top_of_meter,
|
||||
intersection.x, intersection.y,
|
||||
intersection.x, intersection.y,
|
||||
intersection.width, intersection.height,
|
||||
Gdk::RGB_DITHER_NONE, 0, 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __ardour_svn_revision_h__
|
||||
#define __ardour_svn_revision_h__
|
||||
static const char* ardour_svn_revision = "1801";
|
||||
static const char* ardour_svn_revision = "2885";
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue