ardour/livetrax
13
0
Fork 0
Code

GenericUI: Show automation UI for dropdowns

Browse Source 
Also merge the ControlUI local layout of dropdows with the local layout
of other control types (except FileButton).
This commit is contained in:
Julien "_FrnchFrgg_" RIVAUD 2016-07-29 00:54:25 +02:00
parent 5c5b7746a2
commit 7e30161dc0
1 changed files with 79 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/generic_pluginui.cc
View File

@ -724,17 +724,6 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param,
i->second)));
}
if (use_knob) {
control_ui->knobtable = manage (new Table());
control_ui->pack_start(*control_ui->knobtable, true, false);
control_ui->knobtable->attach (control_ui->label, 0, 1, 0, 1);
control_ui->knobtable->attach (*control_ui->combo, 0, 1, 1, 2);
} else {
control_ui->pack_start(control_ui->label, true, true);
control_ui->pack_start(*control_ui->combo, false, true);
}
update_control_display(control_ui);
} else {
@ -779,6 +768,8 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param,
adj->set_value (mcontrol->internal_to_interface(value));
}
if (use_knob) {
set_size_request_to_display_given_text (control_ui->automate_button, "M", 2, 2);
@ -786,7 +777,10 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param,
control_ui->knobtable = manage (new Table());
control_ui->pack_start(*control_ui->knobtable, true, true);
if (control_ui->clickbox) {
if (control_ui->combo) {
control_ui->knobtable->attach (control_ui->label, 0, 1, 0, 1);
control_ui->knobtable->attach (*control_ui->combo, 0, 1, 1, 2);
} else if (control_ui->clickbox) {
control_ui->knobtable->attach (*control_ui->clickbox, 0, 2, 0, 1);
control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK);
control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0);
@ -814,7 +808,9 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param,
} else {
control_ui->pack_start (control_ui->label, true, true);
if (control_ui->clickbox) {
if (control_ui->combo) {
control_ui->pack_start(*control_ui->combo, false, true);
} else if (control_ui->clickbox) {
control_ui->pack_start (*control_ui->clickbox, false, false);
} else if (control_ui->spin_box) {
control_ui->pack_start (*control_ui->spin_box, false, false);
@ -853,8 +849,6 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param,
input_controls.push_back (control_ui);
}
} else {
control_ui->display = manage (new EventBox);