diff --git a/panels/effectcontrols.cpp b/panels/effectcontrols.cpp index 5e58f3cdf..5e187abfc 100644 --- a/panels/effectcontrols.cpp +++ b/panels/effectcontrols.cpp @@ -45,7 +45,7 @@ EffectControls::EffectControls(QWidget *parent) : headers->viewer = panel_sequence_viewer; headers->snapping = false; - effects_area->parent_widget = scrollArea; + effects_area->parent_widget = scrollArea; effects_area->keyframe_area = keyframeView; effects_area->header = headers; keyframeView->header = headers; @@ -260,9 +260,9 @@ void EffectControls::open_effect(QVBoxLayout* layout, Effect* e) { void EffectControls::setup_ui() { QWidget* contents = new QWidget(); - QHBoxLayout* layout = new QHBoxLayout(contents); - layout->setSpacing(0); - layout->setMargin(0); + QHBoxLayout* hlayout = new QHBoxLayout(contents); + hlayout->setSpacing(0); + hlayout->setMargin(0); QSplitter* splitter = new QSplitter(contents); splitter->setOrientation(Qt::Horizontal); @@ -431,7 +431,7 @@ void EffectControls::setup_ui() { splitter->addWidget(keyframeArea); - layout->addWidget(splitter); + hlayout->addWidget(splitter); setWidget(contents); } @@ -546,8 +546,12 @@ bool EffectControls::is_focused() { return false; } -EffectsArea::EffectsArea(QWidget* parent) : QWidget(parent) {} +EffectsArea::EffectsArea(QWidget* parent) : + QWidget(parent) +{} void EffectsArea::resizeEvent(QResizeEvent*) { - parent_widget->setMinimumWidth(sizeHint().width()); +// parent_widget->setMinimumWidth(sizeHint().width()); +// parent_widget->resize(sizeHint().width(), parent_widget->height()); +// parent_widget->updateGeometry(); } diff --git a/panels/effectcontrols.h b/panels/effectcontrols.h index 1201e8a13..5e207e846 100644 --- a/panels/effectcontrols.h +++ b/panels/effectcontrols.h @@ -16,6 +16,7 @@ class ResizableScrollBar; class QLabel; class KeyframeView; class QScrollBar; +class QHBoxLayout; class EffectsArea : public QWidget { public: @@ -53,6 +54,8 @@ public: QScrollBar* verticalScrollBar; QMutex effects_loaded; + + public slots: void update_keyframes(); private slots: @@ -70,7 +73,7 @@ private: void show_effect_menu(int type, int subtype); void load_effects(); void load_keyframes(); - void open_effect(QVBoxLayout* layout, Effect* e); + void open_effect(QVBoxLayout* hlayout, Effect* e); void setup_ui();