ardour/livetrax
13
0
Fork 0
Code

velocity lane: appropriately hide automation controls until we have line automation

Browse Source
This commit is contained in:
Paul Davis 2023-07-08 17:17:56 -06:00
parent 1c54f0e4c0
commit 0c8fd48d6f
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/automation_time_axis.cc
View File

@ -232,8 +232,13 @@ AutomationTimeAxisView::AutomationTimeAxisView (
/* add the buttons */ /* add the buttons */
controls_table.set_border_width (0); controls_table.set_border_width (0);
controls_table.attach (hide_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); controls_table.attach (hide_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
controls_table.attach (name_label, 2, 3, 1, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 2, 0);
controls_table.attach (auto_dropdown, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0); if (show_automation_controls()) {
controls_table.attach (name_label, 2, 3, 1, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 2, 0);
controls_table.attach (auto_dropdown, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
} else {
controls_table.attach (name_label, 3, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 2, 0);
}
Gtk::DrawingArea *blank0 = manage (new Gtk::DrawingArea()); Gtk::DrawingArea *blank0 = manage (new Gtk::DrawingArea());
Gtk::DrawingArea *blank1 = manage (new Gtk::DrawingArea()); Gtk::DrawingArea *blank1 = manage (new Gtk::DrawingArea());
@ -274,7 +279,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
name_label.show (); name_label.show ();
hide_button.show (); hide_button.show ();
if (_controller) { if (show_automation_controls() && _controller) {
_controller->disable_vertical_scroll (); _controller->disable_vertical_scroll ();
controls_table.attach (*_controller.get(), 2, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); controls_table.attach (*_controller.get(), 2, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
} }
@ -312,6 +317,12 @@ AutomationTimeAxisView::~AutomationTimeAxisView ()
CatchDeletion (this); CatchDeletion (this);
} }
bool
AutomationTimeAxisView::show_automation_controls() const
{
return (_parameter.type() != MidiVelocityAutomation) || (velocity_mode() != VelocityModeLollipops);
}
void void
AutomationTimeAxisView::add_contents (bool show_regions) AutomationTimeAxisView::add_contents (bool show_regions)
{ {

2
gtk2_ardour/automation_time_axis.h
View File

@ -232,6 +232,8 @@ protected:
VelocityMode _velocity_mode; VelocityMode _velocity_mode;
bool show_automation_controls () const;
private: private:
int set_state_2X (const XMLNode &, int); int set_state_2X (const XMLNode &, int);
}; };