fixed #571
This commit is contained in:
@@ -24,7 +24,6 @@
|
||||
#include <QVBoxLayout>
|
||||
#include <QResizeEvent>
|
||||
#include <QScrollBar>
|
||||
#include <QSplitter>
|
||||
#include <QScrollArea>
|
||||
#include <QPushButton>
|
||||
#include <QSpacerItem>
|
||||
@@ -321,7 +320,7 @@ void EffectControls::setup_ui() {
|
||||
hlayout->setSpacing(0);
|
||||
hlayout->setMargin(0);
|
||||
|
||||
QSplitter* splitter = new QSplitter();
|
||||
splitter = new QSplitter();
|
||||
splitter->setOrientation(Qt::Horizontal);
|
||||
splitter->setChildrenCollapsible(false);
|
||||
|
||||
@@ -507,6 +506,16 @@ void EffectControls::Retranslate() {
|
||||
UpdateTitle();
|
||||
}
|
||||
|
||||
void EffectControls::LoadLayoutState(const QByteArray &data)
|
||||
{
|
||||
splitter->restoreState(data);
|
||||
}
|
||||
|
||||
QByteArray EffectControls::SaveLayoutState()
|
||||
{
|
||||
return splitter->saveState();
|
||||
}
|
||||
|
||||
void EffectControls::update_scrollbar() {
|
||||
verticalScrollBar->setMaximum(qMax(0, effects_area->height() - keyframeView->height() - headers->height()));
|
||||
verticalScrollBar->setPageStep(verticalScrollBar->height());
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <QLabel>
|
||||
#include <QScrollBar>
|
||||
#include <QHBoxLayout>
|
||||
#include <QSplitter>
|
||||
|
||||
#include "project/projectelements.h"
|
||||
#include "ui/timelineheader.h"
|
||||
@@ -78,6 +79,9 @@ public:
|
||||
void add_effect_paste_action(QMenu* menu);
|
||||
|
||||
virtual void Retranslate() override;
|
||||
|
||||
virtual void LoadLayoutState(const QByteArray& data) override;
|
||||
virtual QByteArray SaveLayoutState() override;
|
||||
public slots:
|
||||
void cut();
|
||||
void copy(bool del = false);
|
||||
@@ -112,6 +116,7 @@ private:
|
||||
QString panel_name;
|
||||
int mode;
|
||||
|
||||
QSplitter* splitter;
|
||||
QPushButton* btnAddVideoEffect;
|
||||
QLabel* lblVideoEffects;
|
||||
QPushButton* btnAddVideoTransition;
|
||||
|
||||
+1
-1
@@ -1185,7 +1185,7 @@ void Project::save_project(bool autorecovery) {
|
||||
sequence_id = 1;
|
||||
|
||||
QFile file(autorecovery ? autorecovery_filename : olive::ActiveProjectFilename);
|
||||
if (!file.open(QIODevice::WriteOnly/* | QIODevice::Text*/)) {
|
||||
if (!file.open(QIODevice::WriteOnly)) {
|
||||
qCritical() << "Could not open file";
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user