This commit is contained in:
itsmattkc
2019-02-02 14:37:27 +11:00
parent f5ae3d88b1
commit 3b9f2bb4ca
9 changed files with 35 additions and 12 deletions
+1
View File
@@ -1187,6 +1187,7 @@ void TimelineWidget::init_ghosts() {
}
// used for trim ops
c->recalculateMaxLength();
g.media_length = c->getMaximumLength();
}
for (int i=0;i<sequence->selections.size();i++) {
+8
View File
@@ -3,6 +3,12 @@
#include <QMutex>
#include <QKeyEvent>
#include <QPainter>
#include <QApplication>
#include <QMenuBar>
#include <QDebug>
#include "mainwindow.h"
ViewerWindow::ViewerWindow(QOpenGLContext *share) :
QOpenGLWindow(share),
@@ -12,6 +18,8 @@ ViewerWindow::ViewerWindow(QOpenGLContext *share) :
{
fullscreen_msg_timer.setInterval(2000);
connect(&fullscreen_msg_timer, SIGNAL(timeout()), this, SLOT(fullscreen_msg_timeout()));
installEventFilter(mainWindow);
}
void ViewerWindow::set_texture(GLuint t, double iar, QMutex* imutex) {
+4 -4
View File
@@ -12,11 +12,11 @@ public:
ViewerWindow(QOpenGLContext* share);
void set_texture(GLuint t, double iar, QMutex *imutex);
protected:
void keyPressEvent(QKeyEvent*);
void mousePressEvent(QMouseEvent*);
void mouseMoveEvent(QMouseEvent*);
virtual void keyPressEvent(QKeyEvent*) override;
virtual void mousePressEvent(QMouseEvent*) override;
virtual void mouseMoveEvent(QMouseEvent*) override;
private:
void paintGL();
virtual void paintGL() override;
GLuint texture;
double ar;
QMutex* mutex;