diff --git a/src/music_gui.cpp b/src/music_gui.cpp index d882cedde4..1d237bcb28 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -768,11 +768,11 @@ struct MusicWindow : public Window { } case WID_M_MUSIC_VOL: - DrawSliderWidget(r, 0, INT8_MAX, 0, _settings_client.music.music_vol, nullptr); + DrawSliderWidget(r, COLOUR_GREY, COLOUR_GREY, TC_BLACK, 0, INT8_MAX, 0, _settings_client.music.music_vol, nullptr); break; case WID_M_EFFECT_VOL: - DrawSliderWidget(r, 0, INT8_MAX, 0, _settings_client.music.effect_vol, nullptr); + DrawSliderWidget(r, COLOUR_GREY, COLOUR_GREY, TC_BLACK, 0, INT8_MAX, 0, _settings_client.music.effect_vol, nullptr); break; } } diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index dd229477d9..76b80b8b3e 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -664,7 +664,7 @@ struct GameOptionsWindow : Window { break; case WID_GO_GUI_SCALE: - DrawSliderWidget(r, MIN_INTERFACE_SCALE, MAX_INTERFACE_SCALE, SCALE_NMARKS, this->gui_scale, ScaleMarkFunc); + DrawSliderWidget(r, GAME_OPTIONS_BACKGROUND, GAME_OPTIONS_BUTTON, TC_BLACK, MIN_INTERFACE_SCALE, MAX_INTERFACE_SCALE, SCALE_NMARKS, this->gui_scale, ScaleMarkFunc); break; case WID_GO_VIDEO_DRIVER_INFO: @@ -672,11 +672,11 @@ struct GameOptionsWindow : Window { break; case WID_GO_BASE_SFX_VOLUME: - DrawSliderWidget(r, 0, INT8_MAX, VOLUME_NMARKS, _settings_client.music.effect_vol, VolumeMarkFunc); + DrawSliderWidget(r, GAME_OPTIONS_BACKGROUND, GAME_OPTIONS_BUTTON, TC_BLACK, 0, INT8_MAX, VOLUME_NMARKS, _settings_client.music.effect_vol, VolumeMarkFunc); break; case WID_GO_BASE_MUSIC_VOLUME: - DrawSliderWidget(r, 0, INT8_MAX, VOLUME_NMARKS, _settings_client.music.music_vol, VolumeMarkFunc); + DrawSliderWidget(r, GAME_OPTIONS_BACKGROUND, GAME_OPTIONS_BUTTON, TC_BLACK, 0, INT8_MAX, VOLUME_NMARKS, _settings_client.music.music_vol, VolumeMarkFunc); break; case WID_GO_OPTIONSPANEL: { diff --git a/src/slider.cpp b/src/slider.cpp index c5dd1c15ea..32b8223cdc 100644 --- a/src/slider.cpp +++ b/src/slider.cpp @@ -22,13 +22,16 @@ static const int SLIDER_WIDTH = 3; /** * Draw a slider widget with knob at given value * @param r Rectangle to draw the widget in + * @param wedge_colour Colour to draw wedge. + * @param handle_colour Colour to draw handle. + * @param text_colour Colour of text. * @param min_value Minimum value of slider * @param max_value Maximum value of slider * @param nmarks Number of marks to display (when mark_func is provided.) * @param value Value to put the slider at * @param mark_func Callback function to get the StringID to draw on a mark. */ -void DrawSliderWidget(Rect r, int min_value, int max_value, int nmarks, int value, SliderMarkFunc *mark_func) +void DrawSliderWidget(Rect r, Colours wedge_colour, Colours handle_colour, TextColour text_colour, int min_value, int max_value, int nmarks, int value, SliderMarkFunc *mark_func) { /* Allow space for labels. We assume they are in the small font. */ if (mark_func != nullptr) r.bottom -= GetCharacterHeight(FS_SMALL) + WidgetDimensions::scaled.hsep_normal; @@ -42,9 +45,9 @@ void DrawSliderWidget(Rect r, int min_value, int max_value, int nmarks, int valu int wx1 = r.left + sw / 2; int wx2 = r.right - sw / 2; if (_current_text_dir == TD_RTL) std::swap(wx1, wx2); - const uint shadow = GetColourGradient(COLOUR_GREY, SHADE_DARK); - const uint fill = GetColourGradient(COLOUR_GREY, SHADE_LIGHTER); - const uint light = GetColourGradient(COLOUR_GREY, SHADE_LIGHTEST); + const uint shadow = GetColourGradient(wedge_colour, SHADE_DARK); + const uint fill = GetColourGradient(wedge_colour, SHADE_LIGHTER); + const uint light = GetColourGradient(wedge_colour, SHADE_LIGHTEST); const std::array wedge{ Point{wx1, r.bottom - ha}, Point{wx2, r.top + ha}, Point{wx2, r.bottom - ha} }; GfxFillPolygon(wedge, fill); GfxDrawLine(wedge[0].x, wedge[0].y, wedge[2].x, wedge[2].y, light, t); @@ -67,7 +70,7 @@ void DrawSliderWidget(Rect r, int min_value, int max_value, int nmarks, int valu Dimension d = GetStringBoundingBox(*str, FS_SMALL); x = Clamp(x - d.width / 2, r.left, r.right - d.width); - DrawString(x, x + d.width, r.bottom + 1 + WidgetDimensions::scaled.hsep_normal, *str, TC_BLACK, SA_CENTER, false, FS_SMALL); + DrawString(x, x + d.width, r.bottom + 1 + WidgetDimensions::scaled.hsep_normal, *str, text_colour, SA_CENTER, false, FS_SMALL); } } @@ -75,7 +78,7 @@ void DrawSliderWidget(Rect r, int min_value, int max_value, int nmarks, int valu value -= min_value; if (_current_text_dir == TD_RTL) value = max_value - value; x = r.left + (value * (r.right - r.left - sw) / max_value); - DrawFrameRect(x, r.top, x + sw, r.bottom, COLOUR_GREY, {}); + DrawFrameRect(x, r.top, x + sw, r.bottom, handle_colour, {}); } /** diff --git a/src/slider_func.h b/src/slider_func.h index c4938644db..575c36945e 100644 --- a/src/slider_func.h +++ b/src/slider_func.h @@ -11,10 +11,10 @@ #define SLIDER_TYPE_H #include "core/geometry_type.hpp" -#include "strings_type.h" +#include "gfx_type.h" using SliderMarkFunc = std::optional(int nmarks, int mark, int value); -void DrawSliderWidget(Rect r, int min_value, int max_value, int nmarks, int value, SliderMarkFunc *mark_func); +void DrawSliderWidget(Rect r, Colours wedge_colour, Colours handle_colour, TextColour text_colour, int min_value, int max_value, int nmarks, int value, SliderMarkFunc *mark_func); bool ClickSliderWidget(Rect r, Point pt, int min_value, int max_value, int nmarks, int &value); inline bool ClickSliderWidget(Rect r, Point pt, int min_value, int max_value, int nmarks, uint8_t &value)