fixed opengl context corruption when docking/undocking viewer

This commit is contained in:
itsmattkc
2018-08-31 15:11:32 +10:00
parent f12678aac4
commit 24c3ff647c
13 changed files with 104 additions and 90 deletions
-8
View File
@@ -197,14 +197,6 @@ void EffectControls::load_effects() {
}
}
if (selected_clips.size() > 0) {
// ui->scrollArea->setMinimumWidth(ui->effects_area->width());
/*ui->effects_area->layout()->update();
ui->effects_area->layout()->activate();
qDebug() << ui->effects_area->height();
ui->keyframeView->resize(ui->keyframeView->width(), ui->effects_area->height());*/
ui->keyframeView->setMinimumHeight(ui->effects_area->height());
ui->keyframeView->setEnabled(true);
ui->keyframeView->visible_in = effects_in;
+5 -1
View File
@@ -17,6 +17,7 @@
#include "io/config.h"
#include "playback/cacher.h"
#include "dialogs/replaceclipmediadialog.h"
#include "panels/effectcontrols.h"
#include <QFileDialog>
#include <QString>
@@ -559,6 +560,9 @@ void Project::delete_clips_using_selected_media() {
}
void Project::clear() {
// clear effects cache
panel_effect_controls->clear_effects(true);
// delete sequences first because it's important to close all the clips before deleting the media
QVector<Sequence*> sequences = list_all_project_sequences();
for (int i=0;i<sequences.size();i++) {
@@ -574,7 +578,7 @@ void Project::clear() {
}
void Project::new_project() {
// clear existing project
// clear existing project
set_sequence(NULL);
clear();
project_changed = false;
-5
View File
@@ -16,11 +16,6 @@ class QXmlStreamWriter;
class QXmlStreamReader;
class QFile;
#define MEDIA_TYPE_FOOTAGE 0
#define MEDIA_TYPE_SEQUENCE 1
#define MEDIA_TYPE_FOLDER 2
#define MEDIA_TYPE_SOLID 3
#define LOAD_TYPE_VERSION 69
class TimelineAction;
+1 -2
View File
@@ -140,8 +140,7 @@ void Viewer::update_sequence() {
update_end_timecode();
}
viewer_widget->initializeGL();
viewer_widget->repaint();
viewer_widget->update();
update();
}