mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Clipping issues with volume sliders in Music GUI 

Tested with various languages and GUI font sizes, should look good everywhere.

Also clamps near-end values to minimum and maximum so 0 and 127 are possible to achieve even on small GUI sizes (like the default.)
pull/6750/merge
Niels Martin Hansen 2018-03-19 21:25:08 +01:00 committed by frosch
parent bb809e35ce
commit 430e20f7e4
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/music_gui.cpp
View File

@ -18,6 +18,7 @@
#include "window_func.h" #include "window_func.h"
#include "sound_func.h" #include "sound_func.h"
#include "gfx_func.h" #include "gfx_func.h"
#include "zoom_func.h"
#include "core/random_func.hpp" #include "core/random_func.hpp"
#include "error.h" #include "error.h"
#include "core/geometry_func.hpp" #include "core/geometry_func.hpp"
@ -618,15 +619,13 @@ struct MusicWindow : public Window {
} }
case WID_M_MUSIC_VOL: case WID_M_EFFECT_VOL: { case WID_M_MUSIC_VOL: case WID_M_EFFECT_VOL: {
DrawFrameRect(r.left, r.top + 2, r.right, r.bottom - 2, COLOUR_GREY, FR_LOWERED); int sw = ScaleGUITrad(slider_width);
int hsw = sw / 2;
DrawFrameRect(r.left + hsw, r.top + 2, r.right - hsw, r.bottom - 2, COLOUR_GREY, FR_LOWERED);
byte volume = (widget == WID_M_MUSIC_VOL) ? _settings_client.music.music_vol : _settings_client.music.effect_vol; byte volume = (widget == WID_M_MUSIC_VOL) ? _settings_client.music.music_vol : _settings_client.music.effect_vol;
int x = (volume * (r.right - r.left) / 127); if (_current_text_dir == TD_RTL) volume = 127 - volume;
if (_current_text_dir == TD_RTL) { int x = r.left + (volume * (r.right - r.left - sw) / 127);
x = r.right - x; DrawFrameRect(x, r.top, x + sw, r.bottom, COLOUR_GREY, FR_NONE);
} else {
x += r.left;
}
DrawFrameRect(x, r.top, x + slider_width, r.bottom, COLOUR_GREY, FR_NONE);
break; break;
} }
} }
@ -679,6 +678,9 @@ struct MusicWindow : public Window {
byte new_vol = x * 127 / this->GetWidget<NWidgetBase>(widget)->current_x; byte new_vol = x * 127 / this->GetWidget<NWidgetBase>(widget)->current_x;
if (_current_text_dir == TD_RTL) new_vol = 127 - new_vol; if (_current_text_dir == TD_RTL) new_vol = 127 - new_vol;
/* Clamp to make sure min and max are properly settable */
if (new_vol > 124) new_vol = 127;
if (new_vol < 3) new_vol = 0;
if (new_vol != *vol) { if (new_vol != *vol) {
*vol = new_vol; *vol = new_vol;
if (widget == WID_M_MUSIC_VOL) MusicVolumeChanged(new_vol); if (widget == WID_M_MUSIC_VOL) MusicVolumeChanged(new_vol);