aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorenen92 <92enen@gmail.com>2023-03-14 16:02:32 +0000
committerenen92 <92enen@gmail.com>2023-03-14 16:02:32 +0000
commit6b5a6e548aa69cbee2afb1b1e608f070128b9957 (patch)
treeaa8c19dc6d8f4bbf79697fae960ed91dd69af35b
parentdb30b9712e80c4fdead1cb235afdbeaeacd611c8 (diff)
[Settings] Remove IsFullScreen complex condition
-rwxr-xr-xsystem/settings/settings.xml2
-rw-r--r--xbmc/settings/SettingConditions.cpp9
2 files changed, 1 insertions, 10 deletions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 8bd06b3a46..ea4053a91d 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);