mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 22:13:07 +01:00
Code Issues Releases Wiki Activity

Map window: don't add padding for invisible scrollbars

Browse Source
This commit is contained in:
Aaron van Geffen
2024-08-07 14:08:11 +02:00
parent 44e8c0dc68
commit cbf739cf55
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2-ui/windows/Map.cpp
View File

@@ -1405,8 +1405,12 @@ static Widget window_map_widgets[] = {
{
// The initial mini map size should be able to show a reasonably sized map
auto initSize = std::clamp(getTechnicalMapSize(), 100, 254) * 2;
width = initSize + kReservedHSpace + SCROLLBAR_SIZE;
height = initSize + kReservedTopSpace + GetReservedBottomSpace() + SCROLLBAR_SIZE;
width = initSize + kReservedHSpace;
height = initSize + kReservedTopSpace + GetReservedBottomSpace();
auto scrollbarSize = getTechnicalMapSize() > 254 ? SCROLLBAR_SIZE : 2;
width += scrollbarSize;
height += scrollbarSize;
auto maxWindowHeight = ContextGetHeight() - 68;
width = std::min<int16_t>(width, ContextGetWidth());
@@ -1415,9 +1419,13 @@ static Widget window_map_widgets[] = {
void ResetMaxWindowDimensions()
{
max_width = std::clamp(getMiniMapWidth() + kReservedHSpace + SCROLLBAR_SIZE, WW, ContextGetWidth());
max_width = std::clamp(getMiniMapWidth() + kReservedHSpace, WW, ContextGetWidth());
max_height = std::clamp(
getMiniMapWidth() + kReservedTopSpace + GetReservedBottomSpace() + SCROLLBAR_SIZE, WH, ContextGetHeight() - 68);
getMiniMapWidth() + kReservedTopSpace + GetReservedBottomSpace(), WH, ContextGetHeight() - 68);
auto scrollbarSize = getMiniMapWidth() + kReservedHSpace > ContextGetWidth() ? SCROLLBAR_SIZE : 2;
max_width += scrollbarSize;
max_height += scrollbarSize;
}
void ResizeMiniMap()