smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge with 2.0-ongoing R2885.

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@2886 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-01-10 22:29:26 +00:00
parent 8a2e30816e
commit 821e4763fd
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/gtkmm2ext/fastmeter.cc
View file

@ -351,7 +351,12 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
GdkRectangle background; GdkRectangle background;
top_of_meter = (gint) floor (pixheight * current_level); 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.height = top_of_meter;
pixrect.y = pixheight - top_of_meter;
background.x = 0; background.x = 0;
background.y = 0; background.y = 0;
@ -363,12 +368,12 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
intersection.x, intersection.y, intersection.x, intersection.y,
intersection.width, intersection.height); intersection.width, intersection.height);
} }
if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) { 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) // 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, get_window()->draw_pixbuf(get_style()->get_fg_gc(get_state()), pixbuf,
intersection.x, pixheight - top_of_meter, intersection.x, intersection.y,
intersection.x, pixheight - top_of_meter, intersection.x, intersection.y,
intersection.width, intersection.height, intersection.width, intersection.height,
Gdk::RGB_DITHER_NONE, 0, 0); Gdk::RGB_DITHER_NONE, 0, 0);
} }

2
svn_revision.h
View file

@ -1,4 +1,4 @@
#ifndef __ardour_svn_revision_h__ #ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__ #define __ardour_svn_revision_h__
static const char* ardour_svn_revision = "1801"; static const char* ardour_svn_revision = "2885";
#endif #endif