mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-27 23:37:20 +00:00
Code Issues Projects Releases Wiki Activity

Do not take in account UI scaling factor twice

Browse Source
This commit is contained in:
Andrei Kortunov 2024-04-22 11:26:09 +04:00
parent 2438fb4c98
commit d10b0d503b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/mwgui/windowbase.cpp
View File

@ -7,7 +7,6 @@
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"
#include <components/settings/values.hpp>
#include <components/widgets/imagebutton.hpp> #include <components/widgets/imagebutton.hpp>
#include "draganddrop.hpp" #include "draganddrop.hpp"
@ -80,12 +79,12 @@ void WindowBase::center()
void WindowBase::clampWindowCoordinates(MyGUI::Window* window) void WindowBase::clampWindowCoordinates(MyGUI::Window* window)
{ {
auto minSize = window->getMinSize(); MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
minSize.height = static_cast<int>(minSize.height * Settings::gui().mScalingFactor); if (window->getLayer())
minSize.width = static_cast<int>(minSize.width * Settings::gui().mScalingFactor); viewSize = window->getLayer()->getSize();
// Window's minimum size is larger than the screen size, can not clamp coordinates // Window's minimum size is larger than the screen size, can not clamp coordinates
MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize(); auto minSize = window->getMinSize();
if (minSize.width > viewSize.width || minSize.height > viewSize.height) if (minSize.width > viewSize.width || minSize.height > viewSize.height)
return; return;