Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc

[ardour.git] / libs / gtkmm2ext / fastmeter.cc

diff --git a/libs/gtkmm2ext/fastmeter.cc b/libs/gtkmm2ext/fastmeter.cc
index b543d6b1920b24f024faa5e0803b34769832087d..5a775572225b786d0330b166dd19999664fad682 100644 (file)
--- a/libs/gtkmm2ext/fastmeter.cc
+++ b/libs/gtkmm2ext/fastmeter.cc
@@ -25,14 +25,16 @@
 
 #include <stdlib.h>
 
+#include <glibmm.h>
+#include <gdkmm.h>
 #include <gdkmm/rectangle.h>
 #include <gtkmm2ext/fastmeter.h>
 #include <gtkmm2ext/utils.h>
 
 #define UINT_TO_RGB(u,r,g,b) { (*(r)) = ((u)>>16)&0xff; (*(g)) = ((u)>>8)&0xff; (*(b)) = (u)&0xff; }
 #define UINT_TO_RGBA(u,r,g,b,a) { UINT_TO_RGB(((u)>>8),r,g,b); (*(a)) = (u)&0xff; }
+
 using namespace Gtk;
-using namespace Gdk;
 using namespace Glib;
 using namespace Gtkmm2ext;
 using namespace std;
@@ -57,17 +59,22 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len,
                float stp2, float stp3,
                int styleflags
                )
+       : pixheight(0)
+       , pixwidth(0)
+       , _styleflags(styleflags)
+       , orientation(o)
+       , hold_cnt(hold)
+       , hold_state(0)
+       , bright_hold(false)
+       , current_level(0)
+       , current_peak(0)
+       , highlight(false)
 {
-       orientation = o;
-       hold_cnt = hold;
-       hold_state = 0;
-       bright_hold = false;
-       current_peak = 0;
-       current_level = 0;
        last_peak_rect.width = 0;
        last_peak_rect.height = 0;
+       last_peak_rect.x = 0;
+       last_peak_rect.y = 0;
 
-       highlight = false;
        no_rgba_overlay = ! Glib::getenv("NO_METER_SHADE").empty();
 
        _clr[0] = clr0;
@@ -92,9 +99,7 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len,
        _stp[2] = stp2;
        _stp[3] = stp3;
 
-       _styleflags = styleflags;
-
-       set_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK);
+       set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
 
        pixrect.x = 1;
        pixrect.y = 1;
@@ -121,7 +126,7 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len,
        request_width = pixrect.width + 2;
        request_height= pixrect.height + 2;
 
-       queue_draw ();
+       clear ();
 }
 
 FastMeter::~FastMeter ()
@@ -586,10 +591,10 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
                last_peak_rect.x = 1;
                last_peak_rect.width = pixwidth;
                last_peak_rect.y = max(1, 1 + pixheight - (gint) floor (pixheight * current_peak));
-               if (bright_hold) {
-                       last_peak_rect.height = max(0, min(4, pixheight - last_peak_rect.y -1 ));
+               if (bright_hold || (_styleflags & 2)) {
+                       last_peak_rect.height = max(0, min(3, pixheight - last_peak_rect.y - 1 ));
                } else {
-                       last_peak_rect.height = max(0, min(2, pixheight - last_peak_rect.y -1 ));
+                       last_peak_rect.height = max(0, min(2, pixheight - last_peak_rect.y - 1 ));
                }
 
                cairo_set_source (cr, fgpattern->cobj());
@@ -658,8 +663,8 @@ FastMeter::horizontal_expose (GdkEventExpose* ev)
                last_peak_rect.y = 1;
                last_peak_rect.height = pixheight;
                const int xpos = floor (pixwidth * current_peak);
-               if (bright_hold) {
-                       last_peak_rect.width = min(4, xpos );
+               if (bright_hold || (_styleflags & 2)) {
+                       last_peak_rect.width = min(3, xpos );
                } else {
                        last_peak_rect.width = min(2, xpos );
                }
@@ -690,6 +695,8 @@ FastMeter::set (float lvl, float peak)
        float old_level = current_level;
        float old_peak = current_peak;
 
+       if (pixwidth <= 0 || pixheight <=0) return;
+
        if (peak == -1) {
                if (lvl >= current_peak) {
                        current_peak = lvl;
@@ -788,8 +795,8 @@ FastMeter::queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>& win, float ol
                }
                rect.x = 1;
                rect.y = max(1, 1 + pixheight - (gint) floor (pixheight * current_peak));
-               if (bright_hold) {
-                       rect.height = max(0, min(4, pixheight - last_peak_rect.y -1 ));
+               if (bright_hold || (_styleflags & 2)) {
+                       rect.height = max(0, min(3, pixheight - last_peak_rect.y -1 ));
                } else {
                        rect.height = max(0, min(2, pixheight - last_peak_rect.y -1 ));
                }
@@ -859,8 +866,8 @@ FastMeter::queue_horizontal_redraw (const Glib::RefPtr<Gdk::Window>& win, float
                rect.y = 1;
                rect.height = pixheight;
                const int xpos = floor (pixwidth * current_peak);
-               if (bright_hold) {
-                       rect.width = min(4, xpos);
+               if (bright_hold || (_styleflags & 2)) {
+                       rect.width = min(3, xpos);
                } else {
                        rect.width = min(2, xpos);
                }