clean up GUI scaling

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index ecfffa6ae9596ca094a9bc867b381788e2f1b431..62556c801a776dc72cd5309b2cab8f6311251a38 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -49,19 +49,15 @@ LevelMeterBase::LevelMeterBase (Session* s, PBD::EventLoop::InvalidationRecord*
        , regular_meter_width (6)
        , meter_length (0)
        , thin_meter_width(2)
+       , max_peak (minus_infinity())
+       , meter_type (MeterPeak)
+       , color_changed (false)
 {
        set_session (s);
+
        Config->ParameterChanged.connect (_parameter_connection, parent_invalidator, boost::bind (&LevelMeterBase::parameter_changed, this, _1), gui_context());
-       UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeterBase::on_theme_changed));
+       ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun(*this, &LevelMeterBase::parameter_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeterBase::color_handler));
-       max_peak = minus_infinity();
-       meter_type = MeterPeak;
-}
-
-void
-LevelMeterBase::on_theme_changed()
-{
-       style_changed = true;
 }
 
 LevelMeterBase::~LevelMeterBase ()
@@ -262,6 +258,8 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                width = thin_meter_width;
        }
 
+       width = rint (width * ARDOUR_UI::ui_scale);
+
        while (meters.size() < nmeters) {
                meters.push_back (MeterInfo());
        }