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

Remove preprocessing / todo

Browse Source
This commit is contained in:
WarmUpTill
2021-06-04 10:25:41 +02:00
committed by WarmUpTill
parent 72f67705ed
commit bd00a3f97e
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/macro-condition-window.cpp
View File

@@ -83,12 +83,7 @@ bool MacroConditionWindow::Load(obs_data_t *obj)
MacroCondition::Load(obj); MacroCondition::Load(obj);
_window = obs_data_get_string(obj, "window"); _window = obs_data_get_string(obj, "window");
_fullscreen = obs_data_get_bool(obj, "fullscreen"); _fullscreen = obs_data_get_bool(obj, "fullscreen");
#if __APPLE__
// TODO: Implement maximized check on MacOS
_maximized = false;
#else
_maximized = obs_data_get_bool(obj, "maximized"); _maximized = obs_data_get_bool(obj, "maximized");
#endif
_focus = obs_data_get_bool(obj, "focus"); _focus = obs_data_get_bool(obj, "focus");
return true; return true;
} }

12
src/switch-window.cpp
View File

@@ -390,13 +390,7 @@ void WindowSwitch::load(obs_data_t *obj)
window = obs_data_get_string(obj, "windowTitle"); window = obs_data_get_string(obj, "windowTitle");
fullscreen = obs_data_get_bool(obj, "fullscreen"); fullscreen = obs_data_get_bool(obj, "fullscreen");
#if __APPLE__
// TODO:
// not implemented on MacOS as I cannot test it
maximized = false;
#else
maximized = obs_data_get_bool(obj, "maximized"); maximized = obs_data_get_bool(obj, "maximized");
#endif
focus = obs_data_get_bool(obj, "focus") || focus = obs_data_get_bool(obj, "focus") ||
!obs_data_has_user_value(obj, "focus"); !obs_data_has_user_value(obj, "focus");
} }
@@ -425,12 +419,6 @@ WindowSwitchWidget::WindowSwitchWidget(QWidget *parent, WindowSwitch *s)
windows->setEditable(true); windows->setEditable(true);
windows->setMaxVisibleItems(20); windows->setMaxVisibleItems(20);
#if __APPLE__
// TODO:
// not implemented on MacOS as I cannot test it
maximized->setDisabled(true);
maximized->setVisible(false);
#endif
if (s) { if (s) {
windows->setCurrentText(s->window.c_str()); windows->setCurrentText(s->window.c_str());