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

Merge branch 'window_clamp' into 'master'

Browse Source 
Do not take in account UI scaling factor twice

See merge request OpenMW/openmw!4046
This commit is contained in:
psi29a 2024-04-23 10:28:51 +00:00
commit 6d0df9f686
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/windowmanager.hpp"
#include <components/settings/values.hpp>
#include <components/widgets/imagebutton.hpp>
#include "draganddrop.hpp"
@ -80,12 +79,12 @@ void WindowBase::center()
void WindowBase::clampWindowCoordinates(MyGUI::Window* window)
{
auto minSize = window->getMinSize();
minSize.height = static_cast<int>(minSize.height * Settings::gui().mScalingFactor);
minSize.width = static_cast<int>(minSize.width * Settings::gui().mScalingFactor);
MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
if (window->getLayer())
viewSize = window->getLayer()->getSize();
// 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)
return;