diff options
| author | Miguel Borges de Freitas <92enen@gmail.com> | 2023-03-14 19:59:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 19:59:24 +0000 |
| commit | 654cbbe39a6ed919a6aab73973d90556e169fe67 (patch) | |
| tree | d7957d3a140477d282625271ac2e48199cef246e | |
| parent | 103081da4d216eb218c86257943a20d672bb8835 (diff) | |
| parent | 6b5a6e548aa69cbee2afb1b1e608f070128b9957 (diff) | |
Merge pull request #22979 from enen92/isfullscreen_nuke
[Settings] Remove IsFullScreen complex condition
| -rwxr-xr-x | system/settings/settings.xml | 2 | ||||
| -rw-r--r-- | xbmc/settings/SettingConditions.cpp | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml index a26226933a..2921ebc915 100755 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2580,7 +2580,7 @@ <level>1</level> <default>false</default> <dependencies> - <dependency type="enable" on="property" name="IsFullscreen" /> + <dependency type="enable" setting="videoscreen.screen" operator="!is">-1</dependency> <!-- DM_WINDOWED --> </dependencies> <control type="toggle" /> </setting> diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp index cc7181604c..a9d87e3398 100644 --- a/xbmc/settings/SettingConditions.cpp +++ b/xbmc/settings/SettingConditions.cpp @@ -110,14 +110,6 @@ bool HasSystemSdrPeakLuminance(const std::string& condition, return CServiceBroker::GetWinSystem()->HasSystemSdrPeakLuminance(); } -bool IsFullscreen(const std::string& condition, - const std::string& value, - const SettingConstPtr& setting, - void* data) -{ - return CServiceBroker::GetWinSystem()->IsFullScreen(); -} - bool IsHDRDisplay(const std::string& condition, const std::string& value, const SettingConstPtr& setting, @@ -456,7 +448,6 @@ void CSettingConditions::Initialize() m_complexConditions.emplace("hasrumblecontroller", HasRumbleController); m_complexConditions.emplace("haspowerofffeature", HasPowerOffFeature); m_complexConditions.emplace("hassystemsdrpeakluminance", HasSystemSdrPeakLuminance); - m_complexConditions.emplace("isfullscreen", IsFullscreen); m_complexConditions.emplace("ishdrdisplay", IsHDRDisplay); m_complexConditions.emplace("ismasteruser", IsMasterUser); m_complexConditions.emplace("hassubtitlesfontextensions", HasSubtitlesFontExtensions); |