fix computation of rectangle bounding box

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index dc6ad772b168fc02d783822f1e14a69936f1f0c0..194e4461154748a316bf44d9fa19f0a921960e70 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -23,7 +23,6 @@
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/barcontroller.h>
-#include "midi++/manager.h"
 #include "pbd/fastlog.h"
 
 #include "ardour_ui.h"
@@ -44,9 +43,10 @@ using namespace Gtk;
 using namespace std;
 
 LevelMeterBase::LevelMeterBase (Session* s, PBD::EventLoop::InvalidationRecord* ir, FastMeter::Orientation o)
-       : _meter (0)
-       , parent_invalidator(ir)
+       : parent_invalidator(ir)
+       , _meter (0)
        , _meter_orientation(o)
+       , regular_meter_width (6)
        , meter_length (0)
        , thin_meter_width(2)
 {
@@ -137,7 +137,7 @@ LevelMeterBase::update_meters ()
                        const float mpeak = _meter->meter_level(n, MeterMaxPeak);
                        if (mpeak > (*i).max_peak) {
                                (*i).max_peak = mpeak;
-                               (*i).meter->set_highlight(mpeak > Config->get_meter_peak());
+                               (*i).meter->set_highlight(mpeak >= Config->get_meter_peak());
                        }
                        if (mpeak > max_peak) {
                                max_peak = mpeak;
@@ -266,8 +266,8 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                uint32_t b[4];
                float stp[4];
                int styleflags = Config->get_meter_style_led() ? 3 : 1;
-               b[0] = ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get();
-               b[1] = ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get();
+               b[0] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundBot();
+               b[1] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop();
                b[2] = 0x991122ff; // red highlight gradient Bot
                b[3] = 0x551111ff; // red highlight gradient Top
                if (n < nmidi) {
@@ -382,6 +382,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                }
                if (meters[n].width != width || meters[n].length != len || color_changed || meter_type != visible_meter_type) {
                        bool hl = meters[n].meter ? meters[n].meter->get_highlight() : false;
+                       meters[n].packed = false;
                        delete meters[n].meter;
                        meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, _meter_orientation, len,
                                        c[0], c[1], c[2], c[3], c[4],
@@ -427,6 +428,7 @@ LevelMeterBase::meter_button_release (GdkEventButton* ev)
        if (ev->button == 1) {
                clear_meters (false);
        }
+       ButtonRelease(ev);
 
        return true;
 }