From 452eedc994c027e1e1248a49c2a5fa2be328e0bf Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 18 Oct 2022 01:37:41 +0200 Subject: [PATCH] Pixelpushing: align toolbar buttons Removing the shadow makes toolbar and editor-tool buttons align when the editor-mixer is hidden. It also improves consistency with all other tabs that have no shadow on the left. Increasing the table border width to 1, makes aligns the editor-mixer button with the main toolbar. --- gtk2_ardour/ardour_ui2.cc | 2 +- gtk2_ardour/editor.cc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 37f1a9865a..6244931d2e 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -506,7 +506,7 @@ ARDOUR_UI::setup_transport () /* top level packing */ transport_table.set_spacings (0); transport_table.set_row_spacings (4); - transport_table.set_border_width (0); + transport_table.set_border_width (1); transport_frame.set_name ("TransportFrame"); transport_frame.set_shadow_type (Gtk::SHADOW_NONE); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index ecee883d9f..3b23957dcf 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -653,12 +653,14 @@ Editor::Editor () time_bars_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); time_bars_event_box.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_label_button_release)); +#ifndef MIXBUS ArdourWidgets::ArdourDropShadow *axis_view_shadow = manage (new (ArdourWidgets::ArdourDropShadow)); axis_view_shadow->set_size_request (4, -1); axis_view_shadow->set_name("EditorWindow"); axis_view_shadow->show(); edit_packer.attach (*axis_view_shadow, 0, 1, 0, 2, FILL, FILL|EXPAND, 0, 0); +#endif /* labels for the time bars */ edit_packer.attach (time_bars_event_box, 1, 2, 0, 1, FILL, SHRINK, 0, 0); @@ -3342,13 +3344,15 @@ Editor::setup_toolbar () /* Pack everything in... */ toolbar_hbox.set_spacing (2); - toolbar_hbox.set_border_width (2); + toolbar_hbox.set_border_width (1); +#ifndef MIXBUS ArdourWidgets::ArdourDropShadow *tool_shadow = manage (new (ArdourWidgets::ArdourDropShadow)); tool_shadow->set_size_request (4, -1); tool_shadow->show(); ebox_hpacker.pack_start (*tool_shadow, false, false); +#endif ebox_hpacker.pack_start(ebox_vpacker, true, true); Gtk::EventBox* spacer = manage (new Gtk::EventBox); // extra space under the mouse toolbar, for aesthetics