Make Dropdown menus at least as wide as the button
[ardour.git] / gtk2_ardour / generic_pluginui.cc
index e261645df42ea4b3708b1d1a9396a6b8c2a56c6e..8ccce2e75196c1500552efbe2c85b6204549423f 100644 (file)
@@ -87,6 +87,7 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrol
        set_latency_label ();
 
        smaller_hbox->pack_start (latency_button, false, false, 4);
+       smaller_hbox->pack_start (pin_management_button, false, false, 4);
        smaller_hbox->pack_start (_preset_combo, false, false);
        smaller_hbox->pack_start (_preset_modified, false, false);
        smaller_hbox->pack_start (add_button, false, false);
@@ -315,6 +316,9 @@ GenericPluginUI::build ()
        automation_play_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Play));
        automation_write_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Write));
        automation_touch_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Touch));
+
+       /* XXX This is a workaround for AutomationControl not knowing about preset loads */
+       plugin->PresetLoaded.connect (*this, invalidator (*this), boost::bind (&GenericPluginUI::update_input_displays, this), gui_context ());
 }
 
 
@@ -724,17 +728,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,82 +772,89 @@ 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);
+               }
 
-                               control_ui->label.set_alignment (0.5, 0.5);
-                               control_ui->knobtable = manage (new Table());
-                               control_ui->pack_start(*control_ui->knobtable, true, true);
-
-                               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);
-                               } else if (control_ui->spin_box) {
-                                       ArdourKnob* knob = dynamic_cast<ArdourKnob*>(control_ui->controller->widget ());
-                                       knob->set_tooltip_prefix (desc.label + ": ");
-                                       knob->set_printer (insert);
-                                       Alignment *align = manage (new Alignment (.5, .5, 0, 0));
-                                       align->add (*control_ui->controller);
-                                       control_ui->knobtable->attach (*align, 0, 1, 0, 1, EXPAND, SHRINK, 1, 2);
-                                       control_ui->knobtable->attach (*control_ui->spin_box, 0, 2, 1, 2);
-                                       control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 0, 1, SHRINK, SHRINK, 2, 0);
-                               } else if (desc.toggled) {
-                                       Alignment *align = manage (new Alignment (.5, .5, 0, 0));
-                                       align->add (*control_ui->controller);
-                                       control_ui->knobtable->attach (*align, 0, 2, 0, 1, EXPAND, SHRINK, 2, 2);
-                                       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);
-                               } else {
-                                       control_ui->knobtable->attach (*control_ui->controller, 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);
-                               }
+               if (use_knob) {
+                       set_size_request_to_display_given_text (control_ui->automate_button, "M", 2, 2);
 
-                       } else {
+                       control_ui->label.set_alignment (0.5, 0.5);
+                       control_ui->knobtable = manage (new Table());
+                       control_ui->pack_start(*control_ui->knobtable, true, true);
 
-                               control_ui->pack_start (control_ui->label, true, true);
-                               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);
-                                       control_ui->pack_start (*control_ui->controller, false, false);
-                               } else {
-                                       control_ui->pack_start (*control_ui->controller, false, false);
-                               }
-                               control_ui->pack_start (control_ui->automate_button, false, false);
+                       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);
+                       } else if (control_ui->spin_box) {
+                               ArdourKnob* knob = dynamic_cast<ArdourKnob*>(control_ui->controller->widget ());
+                               knob->set_tooltip_prefix (desc.label + ": ");
+                               knob->set_printer (insert);
+                               Alignment *align = manage (new Alignment (.5, .5, 0, 0));
+                               align->add (*control_ui->controller);
+                               control_ui->knobtable->attach (*align, 0, 1, 0, 1, EXPAND, SHRINK, 1, 2);
+                               control_ui->knobtable->attach (*control_ui->spin_box, 0, 2, 1, 2);
+                               control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 0, 1, SHRINK, SHRINK, 2, 0);
+                       } else if (desc.toggled) {
+                               Alignment *align = manage (new Alignment (.5, .5, 0, 0));
+                               align->add (*control_ui->controller);
+                               control_ui->knobtable->attach (*align, 0, 2, 0, 1, EXPAND, SHRINK, 2, 2);
+                               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);
+                       } else {
+                               control_ui->knobtable->attach (*control_ui->controller, 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);
                        }
 
+               } else {
 
-                       if (mcontrol->flags () & Controllable::NotAutomatable) {
-                               control_ui->automate_button.set_sensitive (false);
-                               set_tooltip(control_ui->automate_button, _("This control cannot be automated"));
+                       control_ui->pack_start (control_ui->label, true, true);
+                       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);
+                               control_ui->pack_start (*control_ui->controller, false, false);
                        } else {
-                               control_ui->automate_button.signal_clicked.connect (sigc::bind (
-                                                       sigc::mem_fun(*this, &GenericPluginUI::astate_clicked),
-                                                       control_ui));
-                               mcontrol->alist()->automation_state_changed.connect (
-                                               control_connections,
-                                               invalidator (*this),
-                                               boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui),
-                                               gui_context());
-                               input_controls_with_automation.push_back (control_ui);
-                       }
-
-                       if (desc.toggled) {
-                               control_ui->button = true;
-                               ArdourButton* but = dynamic_cast<ArdourButton*>(control_ui->controller->widget ());
-                               assert (but);
-                               but->set_name ("pluginui toggle");
-                               update_control_display(control_ui);
+                               control_ui->pack_start (*control_ui->controller, false, false);
                        }
+                       control_ui->pack_start (control_ui->automate_button, false, false);
+               }
 
-                       automation_state_changed (control_ui);
 
-                       input_controls.push_back (control_ui);
+               if (mcontrol->flags () & Controllable::NotAutomatable) {
+                       control_ui->automate_button.set_sensitive (false);
+                       set_tooltip(control_ui->automate_button, _("This control cannot be automated"));
+               } else {
+                       control_ui->automate_button.signal_clicked.connect (sigc::bind (
+                                               sigc::mem_fun(*this, &GenericPluginUI::astate_clicked),
+                                               control_ui));
+                       mcontrol->alist()->automation_state_changed.connect (
+                                       control_connections,
+                                       invalidator (*this),
+                                       boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui),
+                                       gui_context());
+                       input_controls_with_automation.push_back (control_ui);
+               }
 
+               if (desc.toggled) {
+                       control_ui->button = true;
+                       ArdourButton* but = dynamic_cast<ArdourButton*>(control_ui->controller->widget ());
+                       assert (but);
+                       but->set_name ("pluginui toggle");
+                       update_control_display(control_ui);
                }
 
+               automation_state_changed (control_ui);
+
+               /* Add to the list of CUIs that need manual update to workaround
+                * AutomationControl not knowing about preset loads */
+               input_controls.push_back (control_ui);
+
        } else {
 
                control_ui->display = manage (new EventBox);
@@ -1019,6 +1019,18 @@ GenericPluginUI::update_control_display (ControlUI* cui)
        }*/
 }
 
+void
+GenericPluginUI::update_input_displays ()
+{
+       /* XXX This is a workaround for AutomationControl not knowing about preset loads */
+       for (vector<ControlUI*>::iterator i = input_controls.begin();
+            i != input_controls.end();
+            ++i) {
+               update_control_display(*i);
+       }
+       return;
+}
+
 void
 GenericPluginUI::control_combo_changed (ControlUI* cui, float value)
 {