From 683c95c53f0aa484a8d7bc0a1b7847a922e35087 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sat, 26 Aug 2017 16:44:37 +1100 Subject: [PATCH] GUI2/Slider: improved some comments and naming related to value labels --- src/gui/widgets/slider.cpp | 6 +++--- src/gui/widgets/slider.hpp | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 25e284f0682a..51309df788b7 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -42,7 +42,7 @@ slider::slider(const implementation::builder_slider& builder) , minimum_value_(0) , minimum_value_label_() , maximum_value_label_() - , value_labels_() + , value_label_generator_() , current_item_mouse_position_(0, 0) { connect_signal(std::bind(&slider::signal_handler_sdl_key_down, this, _2, _3, _5)); @@ -133,8 +133,8 @@ void slider::set_maximum_value(const int maximum_value) t_string slider::get_value_label() const { - if(value_labels_) { - return value_labels_(get_item_position(), get_item_count()); + if(value_label_generator_) { + return value_label_generator_(get_item_position(), get_item_count()); } else if(!minimum_value_label_.empty() && get_value() == get_minimum_value()) { return minimum_value_label_; } else if(!maximum_value_label_.empty() && get_value() == get_maximum_value()) { diff --git a/src/gui/widgets/slider.hpp b/src/gui/widgets/slider.hpp index 4b542d6b11e6..f2770ecdc5d5 100644 --- a/src/gui/widgets/slider.hpp +++ b/src/gui/widgets/slider.hpp @@ -94,11 +94,11 @@ class slider : public scrollbar_base, public integer_selector void set_value_labels(const std::vector& value_labels); - typedef std::function tlabel_creator; + using label_generator = std::function; - void set_value_labels(const tlabel_creator& value_labels) + void set_value_labels(const label_generator& generator) { - value_labels_ = value_labels; + value_label_generator_ = generator; } /** @@ -178,12 +178,11 @@ class slider : public scrollbar_base, public integer_selector t_string maximum_value_label_; /** - * This allows the slider to show custom texts instead of the values. - * This vector should have the same amount of items as options for the - * sliders. When set these texts are shown instead of the values. It also - * overrides minimum_value_label_ and maximum_value_label_. + * Function to output custom value labels for the slider. When set + * its output is shown instead of the numeric values. It also overrides + * minimum_value_label_ and maximum_value_label_. */ - tlabel_creator value_labels_; + label_generator value_label_generator_; /** * When initially pressing the positioner and every time a new value is chosen through dragging, @@ -255,6 +254,7 @@ struct builder_slider : public builder_styled_widget t_string minimum_value_label_; t_string maximum_value_label_; + /* This vector should have the same number of items as the slider's values. */ std::vector value_labels_; };