ported solid effect to glsl

This commit is contained in:
itsmattkc
2018-08-24 18:04:28 +10:00
parent b3c41b6305
commit 0f00f3fdc2
7 changed files with 37 additions and 22 deletions
+2 -2
View File
@@ -27,7 +27,7 @@ KeyframeView::KeyframeView(QWidget *parent) : QWidget(parent), mousedown(false),
}
void KeyframeView::paintEvent(QPaintEvent*) {
QPainter p(this);
QPainter p(this);
int width = getScreenPointFromFrame(panel_effect_controls->zoom, visible_out - visible_in);
setMinimumWidth(width);
@@ -66,7 +66,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));
}
}
/*if (mouseover && mouseover_row < rowY.size()) {
draw_keyframe(p, getScreenPointFromFrame(panel_effect_controls->zoom, mouseover_frame - visible_in), rowY.at(mouseover_row), true);
+7 -4
View File
@@ -1607,11 +1607,14 @@ void TimelineWidget::redraw_clips() {
} else if (ms->preview_done) {
// draw thumbnail/waveform
long media_length = m->get_length_in_frames(clip->sequence->frame_rate);
int waveform_limit = qMin(clip_rect.width(), panel_timeline->getTimelineScreenPointFromFrame(media_length - clip->clip_in));
int waveform_limit;
if (waveform_limit < clip_rect.width() && !ms->infinite_length) {
draw_checkerboard = true;
if (waveform_limit > 0) checkerboard_rect.setLeft(checkerboard_rect.left() + waveform_limit);
if (!ms->infinite_length) {
waveform_limit = qMin(clip_rect.width(), panel_timeline->getTimelineScreenPointFromFrame(media_length - clip->clip_in));
if (waveform_limit < clip_rect.width()) {
draw_checkerboard = true;
if (waveform_limit > 0) checkerboard_rect.setLeft(checkerboard_rect.left() + waveform_limit);
}
}
if (clip->track < 0) {