diff --git a/src/headers/utility.hpp b/src/headers/utility.hpp index bdbc40f1..fde4ef0c 100644 --- a/src/headers/utility.hpp +++ b/src/headers/utility.hpp @@ -82,3 +82,4 @@ void populateSceneItemSelection(QComboBox *list, void populateSceneItemSelection(QComboBox *list, SceneSelection &s); void populateSourceGroupSelection(QComboBox *list); bool windowPosValid(QPoint pos); +bool doubleEquals(double left, double right, double epsilon); diff --git a/src/macro-condition-obs-stats.cpp b/src/macro-condition-obs-stats.cpp index 401723ae..c8d96eb0 100644 --- a/src/macro-condition-obs-stats.cpp +++ b/src/macro-condition-obs-stats.cpp @@ -57,11 +57,6 @@ MacroConditionStats::~MacroConditionStats() os_cpu_usage_info_destroy(_cpu_info); } -bool doubleEquals(double left, double right, double epsilon) -{ - return (fabs(left - right) < epsilon); -} - bool MacroConditionStats::CheckFPS() { switch (_condition) { diff --git a/src/macro-tab.cpp b/src/macro-tab.cpp index bc49cf8f..075d9342 100644 --- a/src/macro-tab.cpp +++ b/src/macro-tab.cpp @@ -646,8 +646,11 @@ void fade(QWidget *widget, bool fadeOut) if (curEffect) { auto curOpacity = dynamic_cast(curEffect); - if (curOpacity && ((fadeOut && curOpacity->opacity() == 0.3) || - (!fadeOut && curOpacity->opacity() == 1))) { + if (curOpacity && + ((fadeOut && + doubleEquals(curOpacity->opacity(), 0.3, 0.0001)) || + (!fadeOut && + doubleEquals(curOpacity->opacity(), 1, 0.0001)))) { return; } } else if (!fadeOut) { diff --git a/src/utility.cpp b/src/utility.cpp index 612ccbea..2abe8eb7 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -989,3 +989,8 @@ void setHeightToContentHeight(QListWidget *list) 2 * list->frameWidth()); } } + +bool doubleEquals(double left, double right, double epsilon) +{ + return (fabs(left - right) < epsilon); +}