Merge branch 'master' into stable

1 files changed, 14 insertions, 5 deletions

diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index e54c9e374..79ef2b961 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -29,6 +29,8 @@
 
 #include "localconsts.h"
 
+class ImageCollection;
+
 /**
  * Slider widget. Same as the Guichan slider but with custom look.
  *
@@ -66,11 +68,6 @@ class Slider final : public gcn::Slider,
         void draw(gcn::Graphics *graphics) override final;
 
         /**
-         * Draws the marker.
-         */
-        void drawMarker(gcn::Graphics *const graphics) const;
-
-        /**
          * Called when the mouse enteres the widget area.
          */
         void mouseEntered(gcn::MouseEvent& event) override final;
@@ -80,8 +77,18 @@ class Slider final : public gcn::Slider,
          */
         void mouseExited(gcn::MouseEvent& event) override final;
 
+        void mousePressed(gcn::MouseEvent &mouseEvent) override final;
+
+        void mouseDragged(gcn::MouseEvent &mouseEvent) override final;
+
+        void mouseWheelMovedUp(gcn::MouseEvent &mouseEvent) override final;
+
+        void mouseWheelMovedDown(gcn::MouseEvent &mouseEvent) override final;
+
         void keyPressed(gcn::KeyEvent& keyEvent) override final;
 
+        void setValue2(const double value);
+
         enum SLIDER_ENUM
         {
             HSTART = 0,
@@ -104,7 +111,9 @@ class Slider final : public gcn::Slider,
         static ImageRect buttons[2];
         static float mAlpha;
         static int mInstances;
+        ImageCollection *mVertexes;
         bool mHasMouse;
+        bool mRedraw;
 };
 
 #endif  // GUI_WIDGETS_SLIDER_H