fix computation of Text bounding box to respect _clamped_width

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 76396e845d5f51cbfce95d4898fcfca7ba8f52d9..e9ad63103291a739741104857cff76103009de22 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -78,6 +78,11 @@ ARDOUR_UI::setup_windows ()
                return -1;
        }
 
+       if (create_meterbridge ()) {
+               error << _("UI: cannot setup meterbridge") << endmsg;
+               return -1;
+       }
+
        /* all other dialogs are created conditionally */
 
        we_have_dependents ();
@@ -139,6 +144,7 @@ ARDOUR_UI::setup_tooltips ()
        set_tip (feedback_alert_button, _("When active, there is a feedback loop."));
        set_tip (primary_clock, _("<b>Primary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
        set_tip (secondary_clock, _("<b>Secondary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
+       set_tip (editor_meter_peak_display, _("Reset Level Meter"));
 
        synchronize_sync_source_and_video_pullup ();
 
@@ -412,6 +418,8 @@ ARDOUR_UI::setup_transport ()
                 transport_tearoff_hbox.pack_start (_editor_transport_box, false, false);
         }
        transport_tearoff_hbox.pack_start (alert_box, false, false);
+       transport_tearoff_hbox.pack_start (meter_box, false, false);
+       transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
 
        if (Profile->get_sae()) {
                Image* img = manage (new Image ((::get_icon (X_("sae")))));
@@ -612,11 +620,10 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
                return false;
        }
 
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleRCOptionsEditor"));
+       RefPtr<Action> act = ActionManager::get_action (X_("Window"), X_("toggle-rc-options-editor"));
        assert (act);
 
-       RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
-       tact->set_active ();
+       act->activate();
 
        rc_option_editor->set_current_page (_("Misc"));
        return true;