ported more effects to gles

This commit is contained in:
itsmattkc
2019-03-28 21:43:05 +11:00
parent 86bd06795a
commit 31bb862715
39 changed files with 50 additions and 113 deletions
-1
View File
@@ -108,7 +108,6 @@ void CollapsibleWidget::SetContents(QWidget* c) {
contents = c;
if (!existing) {
layout->addWidget(contents);
connect(enabled_check, SIGNAL(toggled(bool)), contents, SLOT(setEnabled(bool)));
connect(collapse_button, SIGNAL(clicked()), this, SLOT(on_visible_change()));
}
}
+1 -1
View File
@@ -347,7 +347,7 @@ void GraphView::paintEvent(QPaintEvent *) {
p.drawLine(playhead_x, 0, playhead_x, height());
if (rect_select) {
draw_selection_rectangle(p, QRect(rect_select_x, rect_select_y, rect_select_w, rect_select_h));
olive::ui::DrawSelectionRectangle(p, QRect(rect_select_x, rect_select_y, rect_select_w, rect_select_h));
p.setBrush(Qt::NoBrush);
}
}
+1 -1
View File
@@ -182,7 +182,7 @@ void KeyframeView::paintEvent(QPaintEvent*) {
}
if (select_rect) {
draw_selection_rectangle(p, QRect(rect_select_x, rect_select_y, rect_select_w, rect_select_h));
olive::ui::DrawSelectionRectangle(p, QRect(rect_select_x, rect_select_y, rect_select_w, rect_select_h));
}
/*if (mouseover && mouseover_row < rowY.size()) {
+1 -1
View File
@@ -20,7 +20,7 @@
#include "rectangleselect.h"
void draw_selection_rectangle(QPainter& painter, const QRect& rect) {
void olive::ui::DrawSelectionRectangle(QPainter& painter, const QRect& rect) {
painter.setPen(QColor(204, 204, 204));
painter.setBrush(QColor(0, 0, 0, 32));
painter.drawRect(rect);
+7 -1
View File
@@ -23,6 +23,9 @@
#include <QPainter>
namespace olive {
namespace ui {
/**
* @brief Routine for drawing a drag selection rectangle for any given QPainter
*
@@ -34,6 +37,9 @@
*
* Rectangle to draw
*/
void draw_selection_rectangle(QPainter& painter, const QRect& rect);
void DrawSelectionRectangle(QPainter& painter, const QRect& rect);
}
}
#endif // RECTANGLESELECT_H
+14 -14
View File
@@ -25,25 +25,25 @@
class ResizableScrollBar : public QScrollBar
{
Q_OBJECT
Q_OBJECT
public:
ResizableScrollBar(QWidget * parent = 0);
bool is_resizing();
ResizableScrollBar(QWidget * parent = nullptr);
bool is_resizing();
signals:
void resize_move(double i);
void resize_move(double i);
protected:
void resizeEvent(QResizeEvent *event) override;
void mousePressEvent(QMouseEvent *) override;
void mouseMoveEvent(QMouseEvent *) override;
void mouseReleaseEvent(QMouseEvent *) override;
void resizeEvent(QResizeEvent *event) override;
void mousePressEvent(QMouseEvent *) override;
void mouseMoveEvent(QMouseEvent *) override;
void mouseReleaseEvent(QMouseEvent *) override;
private:
bool resize_init;
bool resize_proc;
int resize_start;
bool resize_top;
bool resize_init;
bool resize_proc;
int resize_start;
bool resize_top;
int resize_start_max;
int resize_start_width;
int resize_start_max;
int resize_start_width;
};
#endif // RESIZABLESCROLLBAR_H
+1 -1
View File
@@ -3269,7 +3269,7 @@ void TimelineWidget::paintEvent(QPaintEvent*) {
rect_select.translate(0, height());
}
draw_selection_rectangle(p, rect_select);
olive::ui::DrawSelectionRectangle(p, rect_select);
}
// Draw ghosts