oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed minimum width from effect controls

Browse Source
This commit is contained in:
itsmattkc
2019-01-11 19:38:58 +11:00
parent 5bb256156e
commit ee019517b1
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/effectcontrols.cpp
+11 -7
View File
@@ -45,7 +45,7 @@ EffectControls::EffectControls(QWidget *parent) :
headers->viewer = panel_sequence_viewer; headers->viewer = panel_sequence_viewer;
headers->snapping = false; headers->snapping = false;
effects_area->parent_widget = scrollArea; effects_area->parent_widget = scrollArea;
effects_area->keyframe_area = keyframeView; effects_area->keyframe_area = keyframeView;
effects_area->header = headers; effects_area->header = headers;
keyframeView->header = headers; keyframeView->header = headers;
@@ -260,9 +260,9 @@ void EffectControls::open_effect(QVBoxLayout* layout, Effect* e) {
void EffectControls::setup_ui() { void EffectControls::setup_ui() {
QWidget* contents = new QWidget(); QWidget* contents = new QWidget();
QHBoxLayout* layout = new QHBoxLayout(contents); QHBoxLayout* hlayout = new QHBoxLayout(contents);
layout->setSpacing(0); hlayout->setSpacing(0);
layout->setMargin(0); hlayout->setMargin(0);
QSplitter* splitter = new QSplitter(contents); QSplitter* splitter = new QSplitter(contents);
splitter->setOrientation(Qt::Horizontal); splitter->setOrientation(Qt::Horizontal);
@@ -431,7 +431,7 @@ void EffectControls::setup_ui() {
splitter->addWidget(keyframeArea); splitter->addWidget(keyframeArea);
layout->addWidget(splitter); hlayout->addWidget(splitter);
setWidget(contents); setWidget(contents);
} }
@@ -546,8 +546,12 @@ bool EffectControls::is_focused() {
return false; return false;
} }
EffectsArea::EffectsArea(QWidget* parent) : QWidget(parent) {} EffectsArea::EffectsArea(QWidget* parent) :
QWidget(parent)
{}
void EffectsArea::resizeEvent(QResizeEvent*) { 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();
} }
panels/effectcontrols.h
+4 -1
View File
@@ -16,6 +16,7 @@ class ResizableScrollBar;
class QLabel; class QLabel;
class KeyframeView; class KeyframeView;
class QScrollBar; class QScrollBar;
class QHBoxLayout;
class EffectsArea : public QWidget { class EffectsArea : public QWidget {
public: public:
@@ -53,6 +54,8 @@ public:
QScrollBar* verticalScrollBar; QScrollBar* verticalScrollBar;
QMutex effects_loaded; QMutex effects_loaded;
public slots: public slots:
void update_keyframes(); void update_keyframes();
private slots: private slots:
@@ -70,7 +73,7 @@ private:
void show_effect_menu(int type, int subtype); void show_effect_menu(int type, int subtype);
void load_effects(); void load_effects();
void load_keyframes(); void load_keyframes();
void open_effect(QVBoxLayout* layout, Effect* e); void open_effect(QVBoxLayout* hlayout, Effect* e);
void setup_ui(); void setup_ui();