[Wesnoth-cvs-commits] wesnoth/src multiplayer_connect.cpp widgets/sli...

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      04/09/18 22:51:17

Modified files:
        src            : multiplayer_connect.cpp 
        src/widgets    : slider.cpp slider.hpp 

Log message:
        Added "increments" to sliders.
        Made gold sliders have a 25 increment.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/slider.cpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/slider.hpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.66 
wesnoth/src/multiplayer_connect.cpp:1.67
--- wesnoth/src/multiplayer_connect.cpp:1.66    Sat Sep 18 18:52:20 2004
+++ wesnoth/src/multiplayer_connect.cpp Sat Sep 18 22:51:17 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.66 2004/09/18 18:52:20 gruikya Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.67 2004/09/18 22:51:17 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -443,6 +443,7 @@
                sliders_gold_.push_back(gui::slider(*disp_, r));
                sliders_gold_.back().set_min(20);
                sliders_gold_.back().set_max(1000);
+               sliders_gold_.back().set_increment(25);
                
sliders_gold_.back().set_value(lexical_cast_default<int>((**sd)["gold"],100));
                r.w = 30;
                r.x = left+603;
Index: wesnoth/src/widgets/slider.cpp
diff -u wesnoth/src/widgets/slider.cpp:1.28 wesnoth/src/widgets/slider.cpp:1.29
--- wesnoth/src/widgets/slider.cpp:1.28 Sun Jul 18 19:02:25 2004
+++ wesnoth/src/widgets/slider.cpp      Sat Sep 18 22:51:17 2004
@@ -1,4 +1,4 @@
-/* $Id: slider.cpp,v 1.28 2004/07/18 19:02:25 gruikya Exp $ */
+/* $Id: slider.cpp,v 1.29 2004/09/18 22:51:17 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -27,8 +27,8 @@
 namespace gui {
 
 slider::slider(display& d, const SDL_Rect& rect)
-       : widget(d, rect), min_(-100000), max_(100000), value_(0), 
highlight_(false), clicked_(true),
-         dragging_(false)
+       : widget(d, rect), min_(-100000), max_(100000), increment_(1), 
+         value_(0), highlight_(false), clicked_(true), dragging_(false)
 {
        set_dirty(true);
 }
@@ -51,15 +51,28 @@
 
 void slider::set_value(int value)
 {
+       if (value == value_)
+               return;
+
        value_ = value;
        if (value_ > max_)
                value_ = max_;
        if (value_ < min_)
                value_ = min_;
 
+       if (increment_ > 1) {
+               int hi = increment_ / 2;
+               value_ = ((value_ + hi) / increment_) * increment_;
+       }
+
        set_dirty(true);
 }
 
+void slider::set_increment(int increment)
+{
+       increment_ = increment;
+}
+
 int slider::value() const
 {
        return value_;
@@ -170,10 +183,14 @@
                new_value = (int)(tmp2 * (max_ - min_ + 0.0)) + min_;
        }
 
+       set_value(new_value);
+
+#if 0
        if(new_value != value_) {
                value_ = new_value;
                set_dirty(true);
        }
+#endif
 
        draw();
 }
Index: wesnoth/src/widgets/slider.hpp
diff -u wesnoth/src/widgets/slider.hpp:1.17 wesnoth/src/widgets/slider.hpp:1.18
--- wesnoth/src/widgets/slider.hpp:1.17 Thu Jun 17 18:48:35 2004
+++ wesnoth/src/widgets/slider.hpp      Sat Sep 18 22:51:17 2004
@@ -1,4 +1,4 @@
-/* $Id: slider.hpp,v 1.17 2004/06/17 18:48:35 Sirp Exp $ */
+/* $Id: slider.hpp,v 1.18 2004/09/18 22:51:17 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -31,6 +31,8 @@
        void set_min(int value);
        void set_max(int value);
        void set_value(int value);
+       void set_increment(int increment);
+
        int value() const;
        int max_value() const;
        int min_value() const;
@@ -44,6 +46,7 @@
        int min_;
        int max_;
        int value_;
+       int increment_;
 
        bool highlight_;
        bool clicked_;