Skip to content

Commit

Permalink
Codechange: rework codeflow introduced in 098d5b2 (#8837)
Browse files Browse the repository at this point in the history
It didn't sit well to me, how I wrote the commit initially. First
casting a variable into another, only to write it back into the
originally feels wrong.

This flow makes a bit more sense to me.
  • Loading branch information
TrueBrain committed Mar 10, 2021
1 parent 14b61bf commit 4866e43
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/gfx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1873,9 +1873,11 @@ void UpdateGUIZoom()
if (_gui_zoom_cfg == ZOOM_LVL_CFG_AUTO) {
_gui_zoom = static_cast<ZoomLevel>(Clamp(VideoDriver::GetInstance()->GetSuggestedUIZoom(), _settings_client.gui.zoom_min, _settings_client.gui.zoom_max));
} else {
_gui_zoom = static_cast<ZoomLevel>(Clamp(_gui_zoom_cfg, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max));
/* Write the value back in case it was not between min/max. */
_gui_zoom_cfg = _gui_zoom;
/* Ensure the gui_zoom is clamped between min/max. Change the
* _gui_zoom_cfg if it isn't, as this is used to visually show the
* selection in the Game Options. */
_gui_zoom_cfg = Clamp(_gui_zoom_cfg, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max);
_gui_zoom = static_cast<ZoomLevel>(_gui_zoom_cfg);
}

/* Determine real font zoom to use. */
Expand Down

0 comments on commit 4866e43

Please sign in to comment.