diff options
| author | Peter Nelson <peter1138@openttd.org> | 2021-04-18 11:30:28 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2021-04-30 17:08:15 +0100 |
| commit | d32df00b5c1040f34a4ade8c2a6911853b3ea00a (patch) | |
| tree | e8e64d906a9db4e54349bb0ba478ee7aa5fc14cb /src | |
| parent | 4791ff28627eabe6322352428dc1b42344f545b9 (diff) | |
| download | openttd-d32df00b5c1040f34a4ade8c2a6911853b3ea00a.tar.xz | |
Codechange: No longer necessary to manually resize volume sliders.
Diffstat (limited to 'src')
| -rw-r--r-- | src/settings_gui.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 47524bcfb..34c073fe9 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -402,16 +402,6 @@ struct GameOptionsWindow : Window { } break; - case WID_GO_BASE_SFX_VOLUME: - case WID_GO_BASE_MUSIC_VOLUME: - size->width = ScaleGUITrad(67); - size->height = ScaleGUITrad(12); - resize->width = 0; - resize->height = 0; - fill->width = 0; - fill->height = 0; - break; - default: { int selected; DropDownList list = this->BuildDropDownList(widget, &selected); @@ -716,7 +706,7 @@ static const NWidgetPart _nested_game_options_widgets[] = { NWidget(NWID_HORIZONTAL), SetPIP(0, 30, 7), NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_BASE_SFX_DROPDOWN), SetMinimalSize(150, 12), SetDataTip(STR_BLACK_RAW_STRING, STR_GAME_OPTIONS_BASE_SFX_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(150, 12), SetFill(1, 0), - NWidget(WWT_EMPTY, COLOUR_GREY, WID_GO_BASE_SFX_VOLUME), SetMinimalSize(67, 12), SetMinimalTextLines(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), + NWidget(WWT_EMPTY, COLOUR_GREY, WID_GO_BASE_SFX_VOLUME), SetMinimalSize(67, 12), SetFill(0, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), EndContainer(), NWidget(WWT_TEXT, COLOUR_GREY, WID_GO_BASE_SFX_DESCRIPTION), SetMinimalSize(330, 0), SetDataTip(STR_EMPTY, STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP), SetFill(1, 0), SetPadding(6, 0, 6, 0), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7), @@ -730,7 +720,7 @@ static const NWidgetPart _nested_game_options_widgets[] = { NWidget(NWID_HORIZONTAL), SetPIP(0, 30, 7), NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_BASE_MUSIC_DROPDOWN), SetMinimalSize(150, 12), SetDataTip(STR_BLACK_RAW_STRING, STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP), NWidget(WWT_TEXT, COLOUR_GREY, WID_GO_BASE_MUSIC_STATUS), SetMinimalSize(150, 12), SetDataTip(STR_EMPTY, STR_NULL), SetFill(1, 0), - NWidget(WWT_EMPTY, COLOUR_GREY, WID_GO_BASE_MUSIC_VOLUME), SetMinimalSize(67, 12), SetMinimalTextLines(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), + NWidget(WWT_EMPTY, COLOUR_GREY, WID_GO_BASE_MUSIC_VOLUME), SetMinimalSize(67, 12), SetFill(0, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), EndContainer(), NWidget(WWT_TEXT, COLOUR_GREY, WID_GO_BASE_MUSIC_DESCRIPTION), SetMinimalSize(330, 0), SetDataTip(STR_EMPTY, STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP), SetFill(1, 0), SetPadding(6, 0, 6, 0), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7), |