add separator line to meterbridge

diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
index 8a88e7cbbe0b12a6fe74fd0e3597b1259541cfd1..7a432f06dd126d0d5261dd8ccc8d3d7520ddb189 100644 (file)
--- a/gtk2_ardour/ardour3_styles.rc.in
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -1006,3 +1006,8 @@ style "meter_strip_vu" = "default"
   bg[NORMAL] = { 1.0, 1.0, 0.85 }
   fg[NORMAL] = { 0.0, 0.0, 0.0 }
 }
+
+style "meter_strip_sep" = "default"
+{
+  bg[NORMAL] = { 0.0, 0.0, 0.0 }
+}

diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index 26b9a99b7f90508cb61701788cffa75d1bef2746..0e7075cef4410de6894483816e0d4771d18e2cb8 100644 (file)
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -293,6 +293,7 @@ widget "*PluginEditorButton" style:highest "default_toggle_button"
 widget "*meterstripPPM" style:highest "meter_strip_ppm"
 widget "*meterstripDPM" style:highest "meter_strip_dpm"
 widget "*meterstripVU" style:highest "meter_strip_vu"
+widget "*BlackSeparator" style:highest "meter_strip_sep"
 
 widget "*MetricDialogFrame" style:highest "base_frame"
 widget "*MetricEntry" style:highest "medium_bold_entry"

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index f7f18fb273235202f15d98582abf245a6e5f96ac..8ec9834c9df5f42e75d57ff4205bb5efde9ee7c4 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -64,9 +64,11 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
 {
        level_meter = 0;
        _strip_type = 0;
-       strip.set_spacing(2);
+       mtr_vbox.set_spacing(2);
+       nfo_vbox.set_spacing(2);
        peakbx.set_size_request(-1, 14);
        namebx.set_size_request(18, 52);
+       spacer.set_size_request(-1,0);
 
        set_metric_mode(metricmode, mt);
 
@@ -77,17 +79,30 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
 
        meterbox.pack_start(meter_metric_area, true, false);
 
-       strip.pack_start (peakbx, false, false);
-       strip.pack_start (meterbox, true, true);
-       strip.pack_start (btnbox, false, false);
-       strip.pack_start (namebx, false, false);
-       add(strip);
+       mtr_vbox.pack_start (peakbx, false, false);
+       mtr_vbox.pack_start (meterbox, true, true);
+       mtr_vbox.pack_start (spacer, false, false);
+       mtr_container.add(mtr_vbox);
+
+       mtr_hsep.set_size_request(-1,1);
+       mtr_hsep.set_name("BlackSeparator");
+
+       nfo_vbox.pack_start (mtr_hsep, false, false);
+       nfo_vbox.pack_start (btnbox, false, false);
+       nfo_vbox.pack_start (namebx, false, false);
+
+       pack_start (mtr_container, true, true);
+       pack_start (nfo_vbox, false, false);
 
        peakbx.show();
        btnbox.show();
        meter_metric_area.show();
        meterbox.show();
-       strip.show();
+       spacer.show();
+       mtr_vbox.show();
+       mtr_container.show();
+       mtr_hsep.show();
+       nfo_vbox.show();
 
        UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
@@ -100,7 +115,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        , _route(rt)
        , peak_display()
 {
-       strip.set_spacing(2);
+       mtr_vbox.set_spacing(2);
+       nfo_vbox.set_spacing(2);
        RouteUI::set_route (rt);
        SessionHandlePtr::set_session (sess);
 
@@ -173,27 +189,42 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        mutebox.set_size_request(16, 16);
        solobox.set_size_request(16, 16);
        recbox.set_size_request(16, 16);
+       spacer.set_size_request(-1,0);
 
        update_button_box();
        update_name_box();
        update_background (_route->meter_type());
 
-       strip.pack_start (peakbx, false, false);
-       strip.pack_start (meterbox, true, true);
-       strip.pack_start (btnbox, false, false);
-       strip.pack_start (namebx, false, false);
+       mtr_vbox.pack_start (peakbx, false, false);
+       mtr_vbox.pack_start (meterbox, true, true);
+       mtr_vbox.pack_start (spacer, false, false);
+       mtr_container.add(mtr_vbox);
+
+       mtr_hsep.set_size_request(-1,1);
+       mtr_hsep.set_name("BlackSeparator");
+
+       nfo_vbox.pack_start (mtr_hsep, false, false);
+       nfo_vbox.pack_start (btnbox, false, false);
+       nfo_vbox.pack_start (namebx, false, false);
+
+       pack_start (mtr_container, true, true);
+       pack_start (nfo_vbox, false, false);
+
        name_label.show();
        peak_display.show();
        peakbx.show();
        meter_ticks1_area.show();
        meter_ticks2_area.show();
        meterbox.show();
+       spacer.show();
        level_meter->show();
        meter_align.show();
        peak_align.show();
        btnbox.show();
-       add(strip);
-       strip.show();
+       mtr_vbox.show();
+       mtr_container.show();
+       mtr_hsep.show();
+       nfo_vbox.show();
 
        _route->shared_peak_meter()->ConfigurationChanged.connect (
                        route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
@@ -380,7 +411,7 @@ MeterStrip::meter_configuration_changed (ChanCount c)
 void
 MeterStrip::on_size_request (Gtk::Requisition* r)
 {
-       EventBox::on_size_request(r);
+       VBox::on_size_request(r);
 }
 
 void
@@ -395,7 +426,7 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a)
                name_label.set_size_request(18, nh-2);
                name_label.layout()->set_width((nh-4) * PANGO_SCALE);
        }
-       EventBox::on_size_allocate(a);
+       VBox::on_size_allocate(a);
 }
 
 gint
@@ -446,13 +477,13 @@ MeterStrip::update_background(MeterType type)
                case MeterIEC2EBU:
                case MeterK14:
                case MeterK20:
-                       set_name ("meterstripPPM");
+                       mtr_container.set_name ("meterstripPPM");
                        break;
                case MeterVU:
-                       set_name ("meterstripVU");
+                       mtr_container.set_name ("meterstripVU");
                        break;
                default:
-                       set_name ("meterstripDPM");
+                       mtr_container.set_name ("meterstripDPM");
        }
 }
 

diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index 4b5868e9d2bc1f04ec78da3123e8ecec07e7c8e7..f1fe69bce2406bea609399c7c8bf590f2e9a3cfc 100644 (file)
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -43,7 +43,7 @@ namespace Gtk {
        class Style;
 }
 
-class MeterStrip : public Gtk::EventBox, public RouteUI
+class MeterStrip : public Gtk::VBox, public RouteUI
 {
   public:
        MeterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
@@ -90,8 +90,12 @@ class MeterStrip : public Gtk::EventBox, public RouteUI
        void set_button_names ();
 
   private:
-       Gtk::VBox strip;
+       Gtk::VBox mtr_vbox;
+       Gtk::VBox nfo_vbox;
+       Gtk::EventBox mtr_container;
+       Gtk::HSeparator mtr_hsep;
        Gtk::HBox meterbox;
+       Gtk::HBox spacer;
        Gtk::HBox namebx;
        ArdourButton name_label;
        Gtk::DrawingArea meter_metric_area;