moved effects slider drag bool to static and outside core

This commit is contained in:
itsmattkc
2021-07-19 19:25:45 -07:00
parent 9b0c5373b5
commit 6da4464f05
6 changed files with 16 additions and 17 deletions
+4 -2
View File
@@ -26,6 +26,8 @@
namespace olive {
bool NumericSliderBase::effects_slider_is_being_dragged_ = false;
NumericSliderBase::NumericSliderBase(QWidget *parent) :
SliderBase(parent),
drag_ladder_(nullptr),
@@ -64,7 +66,7 @@ void NumericSliderBase::LabelPressed()
connect(drag_ladder_, &SliderLadder::Released, this, &NumericSliderBase::LadderReleased);
if (is_effects_slider_) {
Core::instance()->SetEffectsSliderIsBeingDragged(true);
SetEffectsSliderIsBeingDragged(true);
}
}
@@ -97,7 +99,7 @@ void NumericSliderBase::LadderDragged(int value, double multiplier)
void NumericSliderBase::LadderReleased()
{
if (is_effects_slider_) {
Core::instance()->SetEffectsSliderIsBeingDragged(false);
SetEffectsSliderIsBeingDragged(false);
}
drag_ladder_->deleteLater();
@@ -44,6 +44,9 @@ public:
void SetIsEffectsSlider(bool e) {is_effects_slider_ = e;}
static bool IsEffectsSliderBeingDragged() { return effects_slider_is_being_dragged_; }
void SetEffectsSliderIsBeingDragged(bool e) { effects_slider_is_being_dragged_ = e; }
protected:
const QVariant& GetOffset() const
{
@@ -91,6 +94,11 @@ private:
bool is_effects_slider_;
/**
* @brief An effects slider somewhere is being dragged
*/
static bool effects_slider_is_being_dragged_;
private slots:
void LabelPressed();