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

force horizontal scrollbar and spacer, so strips line up nicely

Browse Source
This commit is contained in:
Ben Loftis
2014-07-28 12:01:54 -05:00
parent 10747bc980
commit fb77669ee5
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/mixer_strip.cc
View File

@@ -78,7 +78,6 @@ using namespace ArdourMeter;
MixerStrip* MixerStrip::_entered_mixer_strip;
int MixerStrip::scrollbar_height = 0;
PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
@@ -522,17 +521,16 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
rec_mon_table.show ();
}
if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {
if (_mixer_owned && route()->is_master() ) {
if (scrollbar_height == 0) {
HScrollbar scrollbar;
Gtk::Requisition requisition(scrollbar.size_request ());
scrollbar_height = requisition.height;
}
HScrollbar scrollbar;
Gtk::Requisition requisition(scrollbar.size_request ());
int scrollbar_height = requisition.height;
spacer = manage (new EventBox);
spacer->set_size_request (-1, scrollbar_height);
spacer->set_size_request (-1, scrollbar_height+2);
global_vpacker.pack_start (*spacer, false, false);
spacer->show();
}
if (is_track()) {

2
gtk2_ardour/mixer_strip.h
View File

@@ -298,8 +298,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
void reset_strip_style ();
static int scrollbar_height;
void update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width width, bool input_button);
void port_connected_or_disconnected (boost::weak_ptr<ARDOUR::Port>, boost::weak_ptr<ARDOUR::Port>);

2
gtk2_ardour/mixer_ui.cc
View File

@@ -120,7 +120,7 @@ Mixer_UI::Mixer_UI ()
b->show_all ();
scroller.add (*b);
scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
setup_track_display ();