Changeset 25966 for ps/trunk/source/gui/CGUI.cpp

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

File:

• ps/trunk/source/gui/CGUI.cpp (modified) (4 diffs)

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_};
 }