From bf0874dbe505ee517612270f8593b513345aa312 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 20 Nov 2018 19:52:09 +1100 Subject: [PATCH] corrected some semantics --- effects/internal/solideffect.cpp | 11 +++++++---- ui/viewerwidget.cpp | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/effects/internal/solideffect.cpp b/effects/internal/solideffect.cpp index f175ececc..42006253d 100644 --- a/effects/internal/solideffect.cpp +++ b/effects/internal/solideffect.cpp @@ -47,10 +47,13 @@ SolidEffect::SolidEffect(Clip* c, const EffectMeta* em) : Effect(c, em) { connect(opacity_field, SIGNAL(changed()), this, SLOT(field_changed())); connect(checkerboard_size_field, SIGNAL(changed()), this, SLOT(field_changed())); - connect(static_cast(solid_type->get_ui_element()), SIGNAL(currentIndexChanged(int)), this, SLOT(ui_update(int))); + // hacky but eh + QComboBox* solid_type_combo = static_cast(solid_type->get_ui_element()); + connect(solid_type_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(ui_update(int))); + ui_update(solid_type_combo->currentIndex()); - vertPath = ":/shaders/common.vert"; - fragPath = ":/shaders/solideffect.frag"; + /*vertPath = ":/shaders/common.vert"; + fragPath = ":/shaders/solideffect.frag";*/ } void SolidEffect::redraw(double timecode) { @@ -178,6 +181,6 @@ void SolidEffect::redraw(double timecode) { } void SolidEffect::ui_update(int i) { - solid_color_field->set_enabled(i == SOLID_TYPE_COLOR); + solid_color_field->set_enabled(i == SOLID_TYPE_COLOR || i == SOLID_TYPE_CHECKERBOARD); checkerboard_size_field->set_enabled(i == SOLID_TYPE_CHECKERBOARD); } diff --git a/ui/viewerwidget.cpp b/ui/viewerwidget.cpp index b0ef15d5e..26cea6ede 100644 --- a/ui/viewerwidget.cpp +++ b/ui/viewerwidget.cpp @@ -44,8 +44,8 @@ ViewerWidget::ViewerWidget(QWidget *parent) : format.setDepthBufferSize(24); setFormat(format); - // error handler - retries after 500ms if we couldn't get the entire image - retry_timer.setInterval(500); + // error handler - retries after 50ms if we couldn't get the entire image + retry_timer.setInterval(50); connect(&retry_timer, SIGNAL(timeout()), this, SLOT(retry())); setContextMenuPolicy(Qt::CustomContextMenu); @@ -137,7 +137,7 @@ void ViewerWidget::mouseMoveEvent(QMouseEvent* event) { } else { QDrag* drag = new QDrag(this); QMimeData* mimeData = new QMimeData; - mimeData->setText("h"); + mimeData->setText("h"); // QMimeData will fail without some kind of data drag->setMimeData(mimeData); drag->exec(); }