浏览代码

KonvergoWindow: use m_ignoreFullscreenSettingsChange with fs values only

Shouldn't actually make any difference. But it's cleaner and conveys the
intention more clearly.
Vincent Lang 8 年之前
父节点
当前提交
c5f79eee00
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      src/ui/KonvergoWindow.cpp

+ 4 - 4
src/ui/KonvergoWindow.cpp

@@ -295,16 +295,16 @@ void KonvergoWindow::playerWindowVisible(bool visible)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 void KonvergoWindow::updateMainSectionSettings(const QVariantMap& values)
 {
-  if (m_ignoreFullscreenSettingsChange > 0)
-    return;
-
   // update mouse visibility if needed
   if (values.find("disablemouse") != values.end())
   {
     SystemComponent::Get().setCursorVisibility(!SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "disablemouse").toBool());
   }
 
-  if (values.contains("alwaysOnTop") || values.contains("fullscreen"))
+  if (values.contains("alwaysOnTop"))
+    updateWindowState();
+
+  if (values.contains("fullscreen") && !m_ignoreFullscreenSettingsChange)
   {
     InputComponent::Get().cancelAutoRepeat();
     updateWindowState();