diff --git a/apps/openmw/mwgui/controllers.cpp b/apps/openmw/mwgui/controllers.cpp
index 2c3ef4ae0..e62fb3fce 100644
--- a/apps/openmw/mwgui/controllers.cpp
+++ b/apps/openmw/mwgui/controllers.cpp
@@ -23,9 +23,9 @@ namespace MWGui
mTimeLeft = mInit;
mTimeLeft -= _time;
- if(mTimeLeft <= 0)
+ while (mTimeLeft <= 0)
{
- mTimeLeft = mStep;
+ mTimeLeft += mStep;
eventRepeatClick(_widget, this);
}
return true;
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index c57630f08..04ef0e7cb 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -899,7 +899,6 @@ namespace MWGui
: mEnableRepeat(true)
, mRepeatTriggerTime(0.5)
, mRepeatStepTime(0.1)
- , mStepSize(0)
{
}
@@ -945,21 +944,9 @@ namespace MWGui
mRepeatStepTime = step;
}
- void MWScrollBar::setStepSize(int step)
- {
- mStepSize = step;
- }
-
- int MWScrollBar::getStepSize()
- {
- return mStepSize;
- }
-
void MWScrollBar::repeatClick(MyGUI::Widget* _widget, MyGUI::ControllerItem* _controller)
{
- int stepSize = mStepSize;
- if(stepSize == 0)
- stepSize = mScrollRange/20;
+ int stepSize = mScrollPage;
if(mIsIncreasing && mScrollPosition < mScrollRange-1)
{
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index 136056bf4..1630ab3c9 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -422,8 +422,6 @@ namespace MWGui
bool getEnableRepeat();
void getRepeat(float &trigger, float &step);
void setRepeat(float trigger, float step);
- void setStepSize(int step);
- int getStepSize();
protected:
virtual void initialiseOverride();
@@ -433,7 +431,6 @@ namespace MWGui
float mRepeatTriggerTime;
float mRepeatStepTime;
bool mIsIncreasing;
- int mStepSize;
private:
void onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index b4ac8a247..ab91aed78 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -16,7 +16,8 @@
-
+
+
@@ -31,7 +32,8 @@
-
+
+
@@ -65,35 +67,40 @@
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
@@ -118,7 +125,8 @@
-
+
+
@@ -183,7 +191,8 @@
-
+
+
@@ -208,7 +217,8 @@
-
+
+
@@ -216,7 +226,8 @@
-
+
+