smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 11:46:25 +01:00
Code Issues Projects Releases Wiki Activity

Fix mixer left/right scroll, snap to strip boundary.

Browse source 
Ignore add-button (packed at end, start of list) when iterating
over strip_packer.children.
This commit is contained in:
Robin Gareus 2018-02-13 11:18:03 +01:00
parent 7cf408e693
commit 17b6d71467
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gtk2_ardour/mixer_ui.cc
View file

@ -135,17 +135,16 @@ Mixer_UI::Mixer_UI ()
scroller_base.drag_dest_set (target_table); scroller_base.drag_dest_set (target_table);
scroller_base.signal_drag_data_received().connect (sigc::mem_fun(*this, &Mixer_UI::scroller_drag_data_received)); scroller_base.signal_drag_data_received().connect (sigc::mem_fun(*this, &Mixer_UI::scroller_drag_data_received));
//create a button to add mixer strips ( replaces the old buttons in the mixer list ) /* create a button to add mixer strips */
Button* add_button = manage (new Button); add_button.show ();
add_button->show ();
Widget* w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON)); Widget* w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
w->show (); w->show ();
add_button->add (*w); add_button.add (*w);
add_button->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_track_or_bus)); add_button.signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_track_or_bus));
// add as last item of strip packer /* add as last item of strip packer */
strip_packer.pack_end (scroller_base, true, true); strip_packer.pack_end (scroller_base, true, true);
strip_packer.pack_end (*add_button, false, false); strip_packer.pack_end (add_button, false, false);
_group_tabs = new MixerGroupTabs (this); _group_tabs = new MixerGroupTabs (this);
VBox* b = manage (new VBox); VBox* b = manage (new VBox);
@ -1436,7 +1435,7 @@ Mixer_UI::redisplay_track_list ()
container_clear (vca_hpacker); container_clear (vca_hpacker);
//create a button to add mixer strips ( replaces the old buttons in the mixer list ) /* create a button to add mixer strips */
Button* add_vca_button = manage (new Button); Button* add_vca_button = manage (new Button);
Widget* w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON)); Widget* w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
w->show (); w->show ();
@ -2230,6 +2229,9 @@ Mixer_UI::scroll_left ()
using namespace Gtk::Box_Helpers; using namespace Gtk::Box_Helpers;
const BoxList& strips = strip_packer.children(); const BoxList& strips = strip_packer.children();
for (BoxList::const_iterator i = strips.begin(); i != strips.end(); ++i) { for (BoxList::const_iterator i = strips.begin(); i != strips.end(); ++i) {
if (i->get_widget() == & add_button) {
continue;
}
lm += i->get_widget()->get_width (); lm += i->get_widget()->get_width ();
if (lm >= lp) { if (lm >= lp) {
lm -= i->get_widget()->get_width (); lm -= i->get_widget()->get_width ();
@ -2254,6 +2256,9 @@ Mixer_UI::scroll_right ()
using namespace Gtk::Box_Helpers; using namespace Gtk::Box_Helpers;
const BoxList& strips = strip_packer.children(); const BoxList& strips = strip_packer.children();
for (BoxList::const_iterator i = strips.begin(); i != strips.end(); ++i) { for (BoxList::const_iterator i = strips.begin(); i != strips.end(); ++i) {
if (i->get_widget() == & add_button) {
continue;
}
lm += i->get_widget()->get_width (); lm += i->get_widget()->get_width ();
if (lm > lp + 1) { if (lm > lp + 1) {
break; break;

1
gtk2_ardour/mixer_ui.h
View file

@ -167,6 +167,7 @@ private:
Gtk::Label vca_label; Gtk::Label vca_label;
Gtk::EventBox vca_scroller_base; Gtk::EventBox vca_scroller_base;
Gtk::HBox out_packer; Gtk::HBox out_packer;
Gtk::Button add_button; // should really be an ArdourButton
ArdourWidgets::HPane list_hpane; ArdourWidgets::HPane list_hpane;
MixerGroupTabs* _group_tabs; MixerGroupTabs* _group_tabs;