- /* XXX this code is not right yet, because it doesn't handle
- the absence of bounds in any sensible fashion.
- */
-
- Adjustment* adj = control_ui->controller->adjustment();
-
- if (desc.integer_step && !desc.toggled) {
- control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox", true);
- Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2);
- if (desc.unit == ParameterDescriptor::MIDI_NOTE) {
- control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::midinote_printer), control_ui));
+ if (use_knob) {
+ control_ui->automate_button.set_sizing_text("M");
+
+ 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->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 + ": ");
+ 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);