Author: mordante
Date: Fri Jul 18 12:42:23 2008
New Revision: 28066
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28066&view=rev
Log:
Fix the off by one error in the range of the slider.
Modified:
trunk/src/gui/widgets/slider.cpp
trunk/src/gui/widgets/slider.hpp
Modified: trunk/src/gui/widgets/slider.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/slider.cpp?rev=28066&r1=28065&r2=28066&view=diff
==============================================================================
--- trunk/src/gui/widgets/slider.cpp (original)
+++ trunk/src/gui/widgets/slider.cpp Fri Jul 18 12:42:23 2008
@@ -83,7 +83,8 @@
const int maximum_value = get_maximum_value();
minimum_value_ = minimum_value;
- set_item_count(distance(minimum_value_, maximum_value));
+ // The number of items needs to include the begin and end so distance +
1.
+ set_item_count(distance(minimum_value_, maximum_value) + 1);
if(value < minimum_value_) {
set_item_position(0);
@@ -103,7 +104,8 @@
const int value = get_value();
- set_item_count(distance(minimum_value_, maximum_value));
+ // The number of items needs to include the begin and end so distance +
1.
+ set_item_count(distance(minimum_value_, maximum_value) + 1);
if(value > maximum_value) {
set_item_position(get_maximum_value());
Modified: trunk/src/gui/widgets/slider.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/slider.hpp?rev=28066&r1=28065&r2=28066&view=diff
==============================================================================
--- trunk/src/gui/widgets/slider.hpp (original)
+++ trunk/src/gui/widgets/slider.hpp Fri Jul 18 12:42:23 2008
@@ -48,7 +48,9 @@
void set_maximum_value(const int maximum_value);
/** Inherited from tinteger_selector_. */
- int get_maximum_value() const { return minimum_value_ +
get_item_count(); }
+ int get_maximum_value() const
+ // The number of items needs to include the begin and end so
count - 1.
+ { return minimum_value_ + get_item_count() - 1; }
private:
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
