Changeset 25966

Timestamp:

Oct 17, 2021, 12:58:51 PM (3 years ago)

Author:

Silier

Message:

There have been quite a bit of number of questions how to change scale of the gui, because this option is hidden from the user.

Use dropdown with values. Implement confirmation box with countdown to revert scale change because buttons can get unable to click.

Differential revision: D3037
Comments by: @vladislavbelov, @Stan, @wraitii, @pieq, @sera
Tested by: @Langbart

Location:

ps/trunk

Files:

• binaries/data/mods/mod/gui/common/functions_msgbox.js (modified) (1 diff)
• binaries/data/mods/mod/gui/common/utilities.js (added)
• binaries/data/mods/mod/gui/msgbox/msgbox.js (modified) (1 diff)
• binaries/data/mods/mod/gui/page_timedconfirmation.xml (added)
• binaries/data/mods/mod/gui/timedconfirmation (added)
• binaries/data/mods/mod/gui/timedconfirmation/timedconfirmation.js (added)
• binaries/data/mods/mod/gui/timedconfirmation/timedconfirmation.xml (added)
• binaries/data/mods/public/gui/options/options.js (modified) (4 diffs)
• binaries/data/mods/public/gui/options/options.json (modified) (1 diff)
• binaries/data/mods/public/gui/options/options.xml (modified) (1 diff)
• source/gui/CGUI.cpp (modified) (4 diffs)
• source/gui/CGUIText.cpp (modified) (3 diffs)
• source/gui/GUIMatrix.cpp (modified) (2 diffs)
• source/gui/ObjectTypes/CInput.cpp (modified) (2 diffs)
• source/ps/CConsole.cpp (modified) (2 diffs)
• source/ps/GameSetup/Config.cpp (modified) (2 diffs)
• source/ps/GameSetup/Config.h (modified) (1 diff)
• source/ps/VideoMode.cpp (modified) (3 diffs)
• source/ps/VideoMode.h (modified) (3 diffs)
• source/ps/scripting/JSInterface_ConfigDB.cpp (modified) (3 diffs)

ps/trunk/binaries/data/mods/mod/gui/common/functions_msgbox.js

@@ -16 +16 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 function openURL(url)
 {

ps/trunk/binaries/data/mods/mod/gui/msgbox/msgbox.js

@@ -25 +25 @@
     let captions = data.buttonCaptions || [translate("OK")];
 
-    // Set button captions and visibility
     let mbButton = [];
-    captions.forEach((caption, i) => {
-        mbButton[i] = Engine.GetGUIObjectByName("mbButton" + (i + 1));
-        mbButton[i].caption = caption;
-        mbButton[i].hidden = false;
-        mbButton[i].onPress = () => {
-            Engine.PopGuiPage(i);
-        };
-
-        // Convention: Cancel is the first button
-        if (i == 0)
-            mbCancelHotkey.onPress = mbButton[i].onPress;
-    });
-
-    // Distribute buttons horizontally
-    let y1 = "100%-46";
-    let y2 = "100%-18";
-    switch (captions.length)
-    {
-    case 1:
-        mbButton[0].size = "18 " + y1 + " 100%-18 " + y2;
-        break;
-    case 2:
-        mbButton[0].size = "18 " + y1 + " 50%-5 " + y2;
-        mbButton[1].size = "50%+5 " + y1 + " 100%-18 " + y2;
-        break;
-    case 3:
-        mbButton[0].size = "18 " + y1 + " 33%-5 " + y2;
-        mbButton[1].size = "33%+5 " + y1 + " 66%-5 " + y2;
-        mbButton[2].size = "66%+5 " + y1 + " 100%-18 " + y2;
-        break;
-    }
+    setButtonCaptionsAndVisibitily(mbButton, captions, mbCancelHotkey, "mbButton");
+    distributeButtonsHorizontally(mbButton, captions);
 }

ps/trunk/binaries/data/mods/public/gui/options/options.js

@@ -147 +147 @@
         }
     },
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     "slider":
     {
@@ -243 +272 @@
                 optionType.sanitizeValue(value, control, option);
 
+
+
             control.tooltip = option.tooltip + (optionType.tooltip ? "\n" + optionType.tooltip(value, option) : "");
 
+
             Engine.ConfigDB_CreateValue("user", option.config, String(value));
             Engine.ConfigDB_SetChanges("user", true);
@@ -250 +282 @@
             g_ChangedKeys.add(option.config);
             fireConfigChangeHandlers(new Set([option.config]));
+
+
+
 
             if (option.function)
@@ -314 +349 @@
     Engine.ConfigDB_WriteFile("user", "config/user.cfg");
     revertChanges();
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

ps/trunk/binaries/data/mods/public/gui/options/options.json

@@ -151 +151 @@
                 "min": 20,
                 "max": 100
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             }
         ]

ps/trunk/binaries/data/mods/public/gui/options/options.xml

@@ -34 +34 @@
                     <object name="option_control_number[n]" size="65% 0 100%-8 100%" type="input" style="ModernInput"/>
                     <object name="option_control_dropdown[n]" size="65% 0 100%-8 100%" type="dropdown" style="ModernDropDown" tooltip_style="tooltipInstant"/>
+
                     <object name="option_control_slider[n]" size="65% 0 100%-8 100%" type="slider" style="ModernSlider"/>
                 </object>

ps/trunk/source/gui/CGUI.cpp

@@ -43 +43 @@
 #include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
+
 #include "ps/XML/Xeromyces.h"
 #include "scriptinterface/ScriptContext.h"
@@ -155 +156 @@
         //  constant conversions when operating in a
         //  float-based environment.
-        m_MousePos = CVector2D((float)ev->ev.motion.x / g_GuiScale, (float)ev->ev.motion.y / g_GuiScale);
+        m_MousePos = CVector2D((float)ev->ev.motion.x / g_);
 
         SGUIMessage msg(GUIM_MOUSE_MOTION);
@@ -180 +181 @@
     if (ev->ev.type == SDL_MOUSEBUTTONDOWN || ev->ev.type == SDL_MOUSEBUTTONUP)
     {
-        m_MousePos = CVector2D((float)ev->ev.button.x / g_GuiScale, (float)ev->ev.button.y / g_GuiScale);
+        m_MousePos = CVector2D((float)ev->ev.button.x / g_);
     }
 
@@ -421 +422 @@
 CSize2D CGUI::GetWindowSize() const
 {
-    return CSize2D{static_cast<float>(g_xres) / g_GuiScale, static_cast<float>(g_yres) / g_GuiScale};
+    return CSize2D{static_cast<float>(g_xres) / g_};
 }
 

ps/trunk/source/gui/CGUIText.cpp

@@ -27 +27 @@
 #include "gui/SettingTypes/CGUIString.h"
 #include "ps/CStrInternStatic.h"
+
 #include "renderer/Renderer.h"
 
@@ -32 +33 @@
 
 extern int g_xres, g_yres;
-extern float g_GuiScale;
 
 // TODO Gee: CRect => CPoint ?
@@ -440 +440 @@
         clipping.right = std::floor(clipping.right);
 
+
         glEnable(GL_SCISSOR_TEST);
         glScissor(
-            std::ceil(clipping.left * g_GuiScale),
-            std::ceil(g_yres - clipping.bottom * g_GuiScale),
-            std::floor(clipping.GetWidth() * g_GuiScale),
-            std::floor(clipping.GetHeight() * g_GuiScale));
+            std::ceil(clipping.left * cale),
+            std::ceil(g_yres - clipping.bottom * cale),
+            std::floor(clipping.GetWidth() * cale),
+            std::floor(clipping.GetHeight() * cale));
     }
 

ps/trunk/source/gui/GUIMatrix.cpp

@@ -1 @@
-/* Copyright (C) 2019 Wildfire Games.
+/* Copyright (C) 20 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -19 +19 @@
 
 #include "GUIMatrix.h"
-
+#include "ps/VideoMode.h"
 #include "maths/Matrix3D.h"
 
 extern int g_xres, g_yres;
-extern float g_GuiScale;
 
 CMatrix3D GetDefaultGuiMatrix()
 {
-    float xres = g_xres / g_GuiScale;
-    float yres = g_yres / g_GuiScale;
+    float xres = g_xres / g_;
+    float yres = g_yres / g_;
 
     CMatrix3D m;

ps/trunk/source/gui/ObjectTypes/CInput.cpp

@@ -32 +32 @@
 #include "ps/Globals.h"
 #include "ps/Hotkey.h"
+
 #include "renderer/Renderer.h"
 
@@ -1239 +1240 @@
     if (cliparea != CRect())
     {
+
         glEnable(GL_SCISSOR_TEST);
         glScissor(
-            cliparea.left * g_GuiScale,
-            g_yres - cliparea.bottom * g_GuiScale,
-            cliparea.GetWidth() * g_GuiScale,
-            cliparea.GetHeight() * g_GuiScale);
+            cliparea.left * cale,
+            g_yres - cliparea.bottom * cale,
+            cliparea.GetWidth() * cale,
+            cliparea.GetHeight() * cale);
     }
 

ps/trunk/source/ps/CConsole.cpp

@@ -46 +46 @@
 #include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
+
 #include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/JSON.h"
@@ -117 +118 @@
     m_fY = 0;
     float height = h * 0.6f;
-    m_fWidth = w / g_GuiScale;
-    m_fHeight = height / g_GuiScale;
+    m_fWidth = w / g_;
+    m_fHeight = height / g_;
 }
 

ps/trunk/source/ps/GameSetup/Config.cpp

@@ -30 +30 @@
 
 int g_xres, g_yres;
-float g_GuiScale = 1.0f;
 
 bool g_Quickstart = false;
@@ -43 +42 @@
 {
     CFG_GET_VAL("pauseonfocusloss", g_PauseOnFocusLoss);
-
-    CFG_GET_VAL("gui.scale", g_GuiScale);
 }
-
 
 static void ProcessCommandLineArgs(const CmdLineArgs& args)

ps/trunk/source/ps/GameSetup/Config.h

@@ -25 +25 @@
 
 extern int g_xres, g_yres;
-extern float g_GuiScale;
 
 extern bool g_Quickstart;

ps/trunk/source/ps/VideoMode.cpp

@@ -179 +179 @@
         return;
     }
-    const float scale = g_GuiScale;
+    const float scale = g_;
     if (scale != 1.0)
     {
@@ -223 +223 @@
     CFG_GET_VAL("windowed", windowed);
     m_ConfigFullscreen = !windowed;
+
+
 
     CFG_GET_VAL("xres", m_ConfigW);
@@ -517 +519 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
 bool CVideoMode::SetFullscreen(bool fullscreen)
 {

ps/trunk/source/ps/VideoMode.h

@@ -53 +53 @@
 
     /**
+
+
+
+
+
      * Switch to fullscreen or windowed mode.
      */
@@ -90 +95 @@
     int GetDesktopFreq() const;
 
+
+
     SDL_Window* GetWindow();
 
@@ -117 +124 @@
     int m_PreferredBPP = 0;
     int m_PreferredFreq = 0;
+
+
 
     // Config file settings (0 if unspecified)

ps/trunk/source/ps/scripting/JSInterface_ConfigDB.cpp

@@ -22 +22 @@
 #include "ps/ConfigDB.h"
 #include "ps/CLogger.h"
+
 #include "scriptinterface/FunctionWrapper.h"
 #include "scriptinterface/ScriptRequest.h"
@@ -194 +195 @@
 }
 
+
+
+
+
+
 void RegisterScriptFunctions(const ScriptRequest& rq)
 {
@@ -208 +214 @@
     ScriptFunction::Register<&Reload>(rq, "ConfigDB_Reload");
     ScriptFunction::Register<&PauseOnFocusLoss>(rq, "PauseOnFocusLoss");
-}
-}
+    ScriptFunction::Register<&SetGUIScale>(rq, "SetGUIScale");
+}
+}