gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #11618: Don't try to display unavailable zoom levels in sprite aligner. (#11619)

Browse Source
This commit is contained in:
Peter Nelson 2023-12-23 13:17:33 +00:00 committed by GitHub
parent acfe367507
commit 5cb7a16edc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf_debug_gui.cpp
View File

@ -827,6 +827,7 @@ struct SpriteAlignerWindow : Window {
{ {
/* On first opening, set initial zoom to current zoom level. */ /* On first opening, set initial zoom to current zoom level. */
if (SpriteAlignerWindow::zoom == ZOOM_LVL_END) SpriteAlignerWindow::zoom = _gui_zoom; if (SpriteAlignerWindow::zoom == ZOOM_LVL_END) SpriteAlignerWindow::zoom = _gui_zoom;
SpriteAlignerWindow::zoom = Clamp(SpriteAlignerWindow::zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max);
this->CreateNestedTree(); this->CreateNestedTree();
this->vscroll = this->GetScrollbar(WID_SA_SCROLLBAR); this->vscroll = this->GetScrollbar(WID_SA_SCROLLBAR);
@ -1073,7 +1074,9 @@ struct SpriteAlignerWindow : Window {
this->vscroll->SetCount(_newgrf_debug_sprite_picker.sprites.size()); this->vscroll->SetCount(_newgrf_debug_sprite_picker.sprites.size());
} }
SpriteAlignerWindow::zoom = Clamp(SpriteAlignerWindow::zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max);
for (ZoomLevel z = ZOOM_LVL_NORMAL; z < ZOOM_LVL_END; z++) { for (ZoomLevel z = ZOOM_LVL_NORMAL; z < ZOOM_LVL_END; z++) {
this->SetWidgetsDisabledState(z < _settings_client.gui.zoom_min || z > _settings_client.gui.zoom_max, WID_SA_ZOOM + z);
this->SetWidgetsLoweredState(SpriteAlignerWindow::zoom == z, WID_SA_ZOOM + z); this->SetWidgetsLoweredState(SpriteAlignerWindow::zoom == z, WID_SA_ZOOM + z);
} }
} }

1
src/settings_table.cpp
View File

@ -265,6 +265,7 @@ static void ZoomMinMaxChanged(int32_t)
{ {
ConstrainAllViewportsZoom(); ConstrainAllViewportsZoom();
GfxClearSpriteCache(); GfxClearSpriteCache();
InvalidateWindowClassesData(WC_SPRITE_ALIGNER);
if (AdjustGUIZoom(false)) { if (AdjustGUIZoom(false)) {
ReInitAllWindows(true); ReInitAllWindows(true);
} }