fix 1024px width layout (remove nudge clock special case)

Due to some change somewhere along the road the nudge clock does
no longer fit in the transport-bar on 1024px screen with 100% font-scale,
even if the 2nd clock is hidden.

However, these days it does fit nicely on its default position even
with wide-editor-mixer on a 1024px screen.

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index ed8da6d6be56892b1e96693b430fc066b8ff29c6..9a3e7e945b9e7bb98b146da692b10eae0da1620e 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -198,8 +198,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        Gtk::Tooltips& tooltips() { return _tooltips; }
 
-       Gtk::HBox& editor_transport_box() { return _editor_transport_box; }
-
        static PublicEditor* _instance;
 
        /** Emitted frequently with the audible frame, false, and the edit point as
@@ -395,7 +393,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        Gtkmm2ext::TearOff*      transport_tearoff;
        Gtk::Frame               transport_frame;
        Gtk::HBox                transport_tearoff_hbox;
-       Gtk::HBox               _editor_transport_box;
        Gtk::HBox                transport_hbox;
        Gtk::Fixed               transport_base;
        Gtk::Fixed               transport_button_base;

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index e813691829d91d92eb62de46f57a2f350c4ba0d4..c7fb167b7ce2602870f27db86c00e7c4892b312a 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -454,10 +454,6 @@ ARDOUR_UI::setup_transport ()
                transport_tearoff_hbox.pack_start (*time_info_box, false, false);
        }
 
-        if (ARDOUR::Profile->get_small_screen()) {
-                transport_tearoff_hbox.pack_start (_editor_transport_box, false, false);
-        }
-
        if (!ARDOUR::Profile->get_trx()) {
                transport_tearoff_hbox.pack_start (alert_box, false, false);
                transport_tearoff_hbox.pack_start (meter_box, false, false);

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e5aa60d9ab7f4960306f46630446de15fe4ab5c2..534dd26ddbbce551b7638db58fabdf9b51a13a65 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3121,11 +3121,7 @@ Editor::setup_toolbar ()
 
        if (!ARDOUR::Profile->get_trx()) {
                hbox->pack_start (snap_box, false, false);
-               if ( !Profile->get_small_screen() || Profile->get_mixbus() ) {
-                       hbox->pack_start (*nudge_box, false, false);
-               } else {
-                       ARDOUR_UI::instance()->editor_transport_box().pack_start (*nudge_box, false, false);
-               }
+               hbox->pack_start (*nudge_box, false, false);
        }
        hbox->pack_start (panic_box, false, false);