ardour/livetrax
13
0
Fork 0
Code

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

Browse Source 
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.
This commit is contained in:
Robin Gareus 2015-06-17 02:20:02 +02:00
parent 9d4c93aca7
commit d059bdb40c
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/ardour_ui.h
View File

@ -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;

4
gtk2_ardour/ardour_ui2.cc
View File

@ -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);

6
gtk2_ardour/editor.cc
View File

@ -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);