Merge branch 'temp1' into stable

1 files changed, 19 insertions, 1 deletions

diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp
index 7e565a291..8d79fdaa0 100644
--- a/src/gui/widgets/tabs/setup_visual.cpp
+++ b/src/gui/widgets/tabs/setup_visual.cpp
@@ -87,7 +87,8 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) :
     mAmbientFxList(new NamesModel),
     mParticleList(new SetupItemNames),
     mParticleTypeList(new NamesModel),
-    mVSyncList(new NamesModel)
+    mVSyncList(new NamesModel),
+    mScaleList(new SetupItemNames)
 {
     // TRANSLATORS: settings tab name
     setName(_("Visual"));
@@ -99,6 +100,18 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) :
     mPreferredFirstItemSize = 150;
 
     // TRANSLATORS: settings option
+    new SetupItemLabel(_("Scale"), "", this);
+
+    for (int f = 1; f <= 7; f ++)
+    {
+        // TRANSLATORS: particle details
+        mScaleList->push_back(toString(f) + "x");
+    }
+    new SetupItemSlider2(_("Scale "), "", "scale",
+        this, "scaleEvent", 1, 7,
+        mScaleList, true);
+
+    // TRANSLATORS: settings option
     new SetupItemLabel(_("Notifications"), "", this);
 
     // TRANSLATORS: settings option
@@ -204,10 +217,15 @@ Setup_Visual::~Setup_Visual()
     mParticleTypeList = nullptr;
     delete mVSyncList;
     mVSyncList = nullptr;
+    delete mScaleList;
+    mScaleList = nullptr;
 }
 
 void Setup_Visual::apply()
 {
     SetupTabScroll::apply();
     Client::applyGrabMode();
+#ifndef WIN32
+    client->applyScale();
+#endif
 }