From ecf588b5ef86804b0074c54b6371cda9e8f346c2 Mon Sep 17 00:00:00 2001
From: Bertram <bertram@cegetel.net>
Date: Thu, 3 Sep 2009 20:37:08 +0200
Subject: Resolved Mantis #847: Login stage Windows won't go less than the
 default gui opacity.

Of course, in-game, the wanted opacity still shows up.
---
 src/gui/widgets/slider.cpp | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

(limited to 'src/gui/widgets/slider.cpp')

diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 6ce5f849..1e9fe4f5 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -26,6 +26,7 @@
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
+#include "gui/skin.h"
 
 Image *Slider::hStart, *Slider::hMid, *Slider::hEnd, *Slider::hGrip;
 Image *Slider::vStart, *Slider::vMid, *Slider::vEnd, *Slider::vGrip;
@@ -117,7 +118,21 @@ void Slider::init()
 
         slider->decRef();
         sliderHi->decRef();
+    }
+
+    mInstances++;
+
+    setMarkerLength(hGrip->getWidth());
+}
+
+void Slider::updateAlpha()
+{
+    float alpha = std::max(config.getValue("guialpha", 0.8),
+                   (double)SkinLoader::instance()->getMinimumOpacity());
 
+    if (alpha != mAlpha)
+    {
+        mAlpha = alpha;
         hStart->setAlpha(mAlpha);
         hMid->setAlpha(mAlpha);
         hEnd->setAlpha(mAlpha);
@@ -137,9 +152,6 @@ void Slider::init()
         vGripHi->setAlpha(mAlpha);
     }
 
-    mInstances++;
-
-    setMarkerLength(hGrip->getWidth());
 }
 
 void Slider::draw(gcn::Graphics *graphics)
@@ -149,27 +161,8 @@ void Slider::draw(gcn::Graphics *graphics)
     int x = 0;
     int y = mHasMouse?(h - hStartHi->getHeight()) / 2:(h - hStart->getHeight()) / 2;
 
-    if (config.getValue("guialpha", 0.8) != mAlpha)
-    {
-        mAlpha = config.getValue("guialpha", 0.8);
-        hStart->setAlpha(mAlpha);
-        hMid->setAlpha(mAlpha);
-        hEnd->setAlpha(mAlpha);
-        hGrip->setAlpha(mAlpha);
-        hStartHi->setAlpha(mAlpha);
-        hMidHi->setAlpha(mAlpha);
-        hEndHi->setAlpha(mAlpha);
-        hGripHi->setAlpha(mAlpha);
+    updateAlpha();
 
-        vStart->setAlpha(mAlpha);
-        vMid->setAlpha(mAlpha);
-        vEnd->setAlpha(mAlpha);
-        vGrip->setAlpha(mAlpha);
-        vStartHi->setAlpha(mAlpha);
-        vMidHi->setAlpha(mAlpha);
-        vEndHi->setAlpha(mAlpha);
-        vGripHi->setAlpha(mAlpha);
-    }
     if (!mHasMouse)
     {
         static_cast<Graphics*>(graphics)->drawImage(hStart, x, y);
-- 
cgit v1.2.3-60-g2f50