diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index 35b65b409f..a1dfd81644 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -311,13 +311,18 @@ DEF_CONSOLE_CMD(ConZoomToLevel) "- The lowest supported zoom-in level is %u.", std::max(ZOOM_LVL_MIN, _settings_client.gui.zoom_min) ); - IConsolePrintF( - CC_WARNING, - _settings_client.gui.zoom_max < ZOOM_LVL_MAX ? - "- The highest zoom-out level allowed by current client settings is %u." : - "- The highest supported zoom-out level is %u.", - std::min(_settings_client.gui.zoom_max, ZOOM_LVL_MAX) - ); + + if (ZOOM_LVL_MIN < _settings_client.gui.zoom_min) { + IConsolePrintF(CC_WARNING, "The lowest zoom-in level allowed by current client settings is %u.", std::max(ZOOM_LVL_MIN, _settings_client.gui.zoom_min)); + } else { + IConsolePrintF(CC_WARNING, "The lowest supported zoom-in level is %u.", std::max(ZOOM_LVL_MIN, _settings_client.gui.zoom_min)); + } + + if (_settings_client.gui.zoom_max < ZOOM_LVL_MAX) { + IConsolePrintF(CC_WARNING, "The highest zoom-out level allowed by current client settings is %u.", std::min(_settings_client.gui.zoom_max, ZOOM_LVL_MAX)); + } else { + IConsolePrintF(CC_WARNING, "The highest supported zoom-out level is %u.", std::min(_settings_client.gui.zoom_max, ZOOM_LVL_MAX)); + } return true; case 2: { diff --git a/src/widget.cpp b/src/widget.cpp index fb8fa2873b..e3135da010 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -3423,7 +3423,7 @@ std::unique_ptr MakeCompanyButtonRows(WidgetID widget_first, Widget Dimension sprite_size = GetSpriteSize(SPR_COMPANY_ICON, nullptr, ZOOM_LVL_OUT_4X); sprite_size.width += WidgetDimensions::unscaled.matrix.Horizontal(); - sprite_size.height += WidgetDimensions::unscaled.matrix.Vertical() + 1; // 1 for the 'offset' of being pressed + sprite_size.height += WidgetDimensions::unscaled.matrix.Vertical(); for (WidgetID widnum = widget_first; widnum <= widget_last; widnum++) { /* Ensure there is room in 'hor' for another button. */