respect field column span and disable scrolling on combo fields

2019-03-13 10:22:30 +11:00
parent 36f3d0ac92
commit ec5ee40dee
6 changed files with 33 additions and 68 deletions
@@ -36,12 +36,15 @@ EffectUI::EffectUI(Effect* e) :

    layout_->addWidget(row_label, i, 0);

+    int column = 1;
    for (int j=0;j<row->FieldCount();j++) {
      EffectField* field = row->Field(j);

      QWidget* widget = field->CreateWidget();

-      layout_->addWidget(widget, i, j + 1);
+      layout_->addWidget(widget, i, column, 1, field->GetColumnSpan());
+
+      column += field->GetColumnSpan();
    }

    // Find maximum column to place keyframe controls