diff options
| author | Robin Gareus <robin@gareus.org> | 2015-06-17 02:20:02 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-06-17 02:20:02 +0200 |
| commit | d059bdb40c65f53c1a4952f88a7a0ef5d99c99fb (patch) | |
| tree | 3cb90415d1fdb59be29f131e65c296c312a2163f | |
| parent | 9d4c93aca7a7d6900c2b4f6c138057a8006321b3 (diff) | |
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.
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 3 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 6 |
3 files changed, 1 insertions, 12 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index ed8da6d6be..9a3e7e945b 100644 --- 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 e813691829..c7fb167b7c 100644 --- 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 e5aa60d9ab..534dd26ddb 100644 --- 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); |