From 791cc6618b44a70373cab862793817d0f3efadfb Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 30 Jun 2018 21:18:47 +0100 Subject: [PATCH] fixed min/max on slider and layer order issues --- olive.pro.user | 2 +- ui/labelslider.cpp | 2 +- ui/viewerwidget.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/olive.pro.user b/olive.pro.user index e8aadb4de..d30bf48be 100644 --- a/olive.pro.user +++ b/olive.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/ui/labelslider.cpp b/ui/labelslider.cpp index a2ee1c53a..06374f355 100644 --- a/ui/labelslider.cpp +++ b/ui/labelslider.cpp @@ -24,7 +24,7 @@ void LabelSlider::set_value(float v) { } else { internal_value = v; } - setText(QString::number(v)); + setText(QString::number(internal_value)); emit valueChanged(); } } diff --git a/ui/viewerwidget.cpp b/ui/viewerwidget.cpp index ad203598b..efe45d021 100644 --- a/ui/viewerwidget.cpp +++ b/ui/viewerwidget.cpp @@ -79,7 +79,7 @@ void ViewerWidget::paintGL() bool added = false; for (int j=0;jtrack > c->track) { + if (current_clips.at(j)->track < c->track) { current_clips.insert(j, c); added = true; break;