Merge branch 'master' into stable

1 files changed, 38 insertions, 0 deletions

diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index b9ea91f76..2cb7f60d1 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -1139,3 +1139,41 @@ void SetupItemSound::action(const gcn::ActionEvent &event)
         SetupItemSliderList::action(event);
     }
 }
+
+SetupItemSliderInt::SetupItemSliderInt(const std::string &restrict text,
+                                       const std::string &restrict description,
+                                       const std::string &restrict keyName,
+                                       SetupTabScroll *restrict const parent,
+                                       const std::string &restrict eventName,
+                                       gcn::ListModel *restrict const model,
+                                       const int min,
+                                       const int width,
+                                       const bool onTheFly,
+                                       const bool mainConfig) :
+    SetupItemSliderList(text, description, keyName, parent, eventName,
+                        model, width, onTheFly, mainConfig),
+    mMin(min)
+{
+    createControls();
+}
+
+void SetupItemSliderInt::addMoreControls()
+{
+    toWidget();
+}
+
+void SetupItemSliderInt::fromWidget()
+{
+    if (!mSlider)
+        return;
+
+    mValue = toString(mSlider->getSelected() + mMin);
+}
+
+void SetupItemSliderInt::toWidget()
+{
+    if (!mSlider)
+        return;
+
+    mSlider->setSelected(atoi(mValue.c_str()) - mMin);
+}