From 1180c95372f839f5f8ddd6dbab1b8a643ddf4328 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sun, 23 Oct 2022 15:35:35 +0100 Subject: [PATCH] Codechange: Add parameters to change range of slider widget. --- src/music_gui.cpp | 6 +++--- src/settings_gui.cpp | 6 +++--- src/widgets/slider.cpp | 21 ++++++++++++++------- src/widgets/slider_func.h | 11 +++++++++-- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 72fec6f9c6..71068aeac8 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -741,11 +741,11 @@ struct MusicWindow : public Window { } case WID_M_MUSIC_VOL: - DrawSliderWidget(r, _settings_client.music.music_vol); + DrawSliderWidget(r, 0, INT8_MAX, _settings_client.music.music_vol); break; case WID_M_EFFECT_VOL: - DrawSliderWidget(r, _settings_client.music.effect_vol); + DrawSliderWidget(r, 0, INT8_MAX, _settings_client.music.effect_vol); break; } } @@ -788,7 +788,7 @@ struct MusicWindow : public Window { case WID_M_MUSIC_VOL: case WID_M_EFFECT_VOL: { // volume sliders byte &vol = (widget == WID_M_MUSIC_VOL) ? _settings_client.music.music_vol : _settings_client.music.effect_vol; - if (ClickSliderWidget(this->GetWidget(widget)->GetCurrentRect(), pt, vol)) { + if (ClickSliderWidget(this->GetWidget(widget)->GetCurrentRect(), pt, 0, INT8_MAX, vol)) { if (widget == WID_M_MUSIC_VOL) { MusicDriver::GetInstance()->SetVolume(vol); } else { diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index dc1f78e50f..8b9d8b3514 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -347,11 +347,11 @@ struct GameOptionsWindow : Window { break; case WID_GO_BASE_SFX_VOLUME: - DrawSliderWidget(r, _settings_client.music.effect_vol); + DrawSliderWidget(r, 0, INT8_MAX, _settings_client.music.effect_vol); break; case WID_GO_BASE_MUSIC_VOLUME: - DrawSliderWidget(r, _settings_client.music.music_vol); + DrawSliderWidget(r, 0, INT8_MAX, _settings_client.music.music_vol); break; } } @@ -478,7 +478,7 @@ struct GameOptionsWindow : Window { case WID_GO_BASE_SFX_VOLUME: case WID_GO_BASE_MUSIC_VOLUME: { byte &vol = (widget == WID_GO_BASE_MUSIC_VOLUME) ? _settings_client.music.music_vol : _settings_client.music.effect_vol; - if (ClickSliderWidget(this->GetWidget(widget)->GetCurrentRect(), pt, vol)) { + if (ClickSliderWidget(this->GetWidget(widget)->GetCurrentRect(), pt, 0, INT8_MAX, vol)) { if (widget == WID_GO_BASE_MUSIC_VOLUME) MusicDriver::GetInstance()->SetVolume(vol); this->SetWidgetDirty(widget); SetWindowClassesDirty(WC_MUSIC_WINDOW); diff --git a/src/widgets/slider.cpp b/src/widgets/slider.cpp index 253cd34c52..5bad981936 100644 --- a/src/widgets/slider.cpp +++ b/src/widgets/slider.cpp @@ -20,11 +20,15 @@ static const int SLIDER_WIDTH = 3; /** * Draw a slider widget with knob at given value - * @param r Rectangle to draw the widget in + * @param r Rectangle to draw the widget in + * @param min_value Minimum value of slider + * @param max_value Maximum value of slider * @param value Value to put the slider at */ -void DrawSliderWidget(Rect r, byte value) +void DrawSliderWidget(Rect r, int min_value, int max_value, int value) { + max_value -= min_value; + /* Draw a wedge indicating low to high value. */ const int ha = (r.bottom - r.top) / 5; int wx1 = r.left, wx2 = r.right; @@ -40,8 +44,8 @@ void DrawSliderWidget(Rect r, byte value) /* Draw a slider handle indicating current value. */ const int sw = ScaleGUITrad(SLIDER_WIDTH); - if (_current_text_dir == TD_RTL) value = 127 - value; - const int x = r.left + (value * (r.right - r.left - sw) / 127); + if (_current_text_dir == TD_RTL) value = max_value - value; + const int x = r.left + ((value - min_value) * (r.right - r.left - sw) / max_value); DrawFrameRect(x, r.top, x + sw, r.bottom, COLOUR_GREY, FR_NONE); } @@ -52,11 +56,14 @@ void DrawSliderWidget(Rect r, byte value) * @param value[in,out] Value to modify * @return True if the value setting was modified */ -bool ClickSliderWidget(Rect r, Point pt, byte &value) +bool ClickSliderWidget(Rect r, Point pt, int min_value, int max_value, int &value) { + max_value -= min_value; + const int sw = ScaleGUITrad(SLIDER_WIDTH); - byte new_value = Clamp((pt.x - r.left - sw / 2) * 127 / (r.right - r.left - sw), 0, 127); - if (_current_text_dir == TD_RTL) new_value = 127 - new_value; + int new_value = Clamp((pt.x - r.left - sw / 2) * max_value / (r.right - r.left - sw), 0, max_value); + if (_current_text_dir == TD_RTL) new_value = max_value - new_value; + new_value += min_value; if (new_value != value) { value = new_value; diff --git a/src/widgets/slider_func.h b/src/widgets/slider_func.h index 64f445da64..35b7737f3d 100644 --- a/src/widgets/slider_func.h +++ b/src/widgets/slider_func.h @@ -14,8 +14,15 @@ #include "../gfx_func.h" -void DrawSliderWidget(Rect r, byte value); -bool ClickSliderWidget(Rect r, Point pt, byte &value); +void DrawSliderWidget(Rect r, int min_value, int max_value, int value); +bool ClickSliderWidget(Rect r, Point pt, int min_value, int max_value, int &value); +inline bool ClickSliderWidget(Rect r, Point pt, int min_value, int max_value, byte &value) +{ + int tmp_value = value; + if (!ClickSliderWidget(r, pt, min_value, max_value, tmp_value)) return false; + value = tmp_value; + return true; +} #endif /* WIDGETS_SLIDER_TYPE_H */