Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix fade animation triggering unexpectedly for controls

Browse Source
This commit is contained in:
WarmUpTill 2022-03-05 16:57:54 +01:00 committed by WarmUpTill
parent 036afb4a4f
commit d1fe5beaeb
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/headers/utility.hpp
View File

@ -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);

5
src/macro-condition-obs-stats.cpp
View File

@ -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) {

7
src/macro-tab.cpp
View File

@ -646,8 +646,11 @@ void fade(QWidget *widget, bool fadeOut)
if (curEffect) {
auto curOpacity =
dynamic_cast<QGraphicsOpacityEffect *>(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) {

5
src/utility.cpp
View File

@ -989,3 +989,8 @@ void setHeightToContentHeight(QListWidget *list)
2 * list->frameWidth());
}
}
bool doubleEquals(double left, double right, double epsilon)
{
return (fabs(left - right) < epsilon);
}