allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Update mixer-strip bottom spacer calculation

Browse Source
This commit is contained in:
Robin Gareus
2025-09-23 22:39:55 +02:00
parent e539cabc00
commit 68128f4156
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
gtk2_ardour/mixer_strip.cc
View File

@@ -105,6 +105,7 @@ using namespace ArdourMeter;
MixerStrip* MixerStrip::_entered_mixer_strip;
PBD::Signal<void(MixerStrip*)> MixerStrip::CatchDeletion;
int MixerStrip::_scrollbar_spacer_height = 0;
#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))
@@ -352,23 +353,10 @@ MixerStrip::init ()
midi_input_enable_button.signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false);
set_tooltip (midi_input_enable_button, _("Enable/Disable MIDI input"));
#ifndef MIXBUS
//add a spacer underneath the master bus;
//this fills the area that is taken up by the scrollbar on the tracks;
//and therefore keeps the faders "even" across the bottom
int scrollbar_height = 0;
{
Gtk::Window window (WINDOW_TOPLEVEL);
HScrollbar scrollbar;
window.add (scrollbar);
scrollbar.set_name ("MixerWindow");
scrollbar.ensure_style();
Gtk::Requisition requisition(scrollbar.size_request ());
scrollbar_height = requisition.height;
scrollbar_height += 3; // track_display_frame border/shadow
}
spacer.set_size_request (-1, scrollbar_height);
update_spacer ();
spacer.set_name ("AudioBusStripBase");
#ifndef MIXBUS
global_vpacker.pack_end (spacer, false, false);
#endif
@@ -795,10 +783,36 @@ MixerStrip::set_stuff_from_route ()
}
}
void
MixerStrip::update_spacer ()
{
if (_scrollbar_spacer_height == 0) {
Gtk::Window window (WINDOW_TOPLEVEL);
Gtk::ScrolledWindow scroller;
scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_ALWAYS);
scroller.set_name ("MixerWindow");
window.add (scroller);
scroller.ensure_style();
const Scrollbar* scrollbar = scroller.get_hscrollbar();
Gtk::Requisition requisition(scrollbar->size_request ());
_scrollbar_spacer_height = requisition.height;
gint scrollbar_spacing = 0;
gtk_widget_style_get (GTK_WIDGET (scroller.gobj()), "scrollbar-spacing", &scrollbar_spacing, NULL);
_scrollbar_spacer_height += scrollbar_spacing;
_scrollbar_spacer_height += 6; // track_display_frame border/shadow
}
spacer.set_size_request (-1, _scrollbar_spacer_height);
}
void
MixerStrip::dpi_reset ()
{
set_width_enum (_width, _width_owner);
_scrollbar_spacer_height = 0;
update_spacer ();
}
void

3
gtk2_ardour/mixer_strip.h
View File

@@ -177,6 +177,8 @@ private:
Width _width;
void* _width_owner;
static int _scrollbar_spacer_height;
ArdourWidgets::ArdourButton hide_button;
ArdourWidgets::ArdourButton width_button;
ArdourWidgets::ArdourButton number_label;
@@ -282,6 +284,7 @@ private:
void name_button_resized (Gtk::Allocation&);
void name_changed ();
void dpi_reset ();
void update_spacer ();
void update_speed_display ();
void map_frozen ();
void hide_processor_editor (std::weak_ptr<ARDOUR::Processor> processor);