From bd00a3f97e4d324ffa93e937214da6412b656fa1 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Fri, 4 Jun 2021 10:25:41 +0200 Subject: [PATCH] Remove preprocessing / todo --- src/macro-condition-window.cpp | 5 ----- src/switch-window.cpp | 12 ------------ 2 files changed, 17 deletions(-) diff --git a/src/macro-condition-window.cpp b/src/macro-condition-window.cpp index 3a4d2407..e0289ba6 100644 --- a/src/macro-condition-window.cpp +++ b/src/macro-condition-window.cpp @@ -83,12 +83,7 @@ bool MacroConditionWindow::Load(obs_data_t *obj) MacroCondition::Load(obj); _window = obs_data_get_string(obj, "window"); _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"); -#endif _focus = obs_data_get_bool(obj, "focus"); return true; } diff --git a/src/switch-window.cpp b/src/switch-window.cpp index f9455382..ebd83322 100644 --- a/src/switch-window.cpp +++ b/src/switch-window.cpp @@ -390,13 +390,7 @@ void WindowSwitch::load(obs_data_t *obj) window = obs_data_get_string(obj, "windowTitle"); 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"); -#endif focus = obs_data_get_bool(obj, "focus") || !obs_data_has_user_value(obj, "focus"); } @@ -425,12 +419,6 @@ WindowSwitchWidget::WindowSwitchWidget(QWidget *parent, WindowSwitch *s) windows->setEditable(true); windows->setMaxVisibleItems(20); -#if __APPLE__ - // TODO: - // not implemented on MacOS as I cannot test it - maximized->setDisabled(true); - maximized->setVisible(false); -#endif if (s) { windows->setCurrentText(s->window.c_str());