From efb541eeef2ad839c885c494c3a065f1f7d5dc03 Mon Sep 17 00:00:00 2001
From: Bertram <bertram@cegetel.net>
Date: Wed, 2 Sep 2009 23:40:45 +0200
Subject: Added a minimum alpha opacity value handle in SkinLoader and made use
 of it.

Part 1 of 3 for Mantis #847
Only a few controls follow minimum opacity value at login stage.
Part 2 will make all other controls do the same.
Part 3 will try to set default gui opacity value as a constant.
---
 src/gui/skin.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/gui/skin.cpp')

diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
index 5881a073..f3f907e1 100644
--- a/src/gui/skin.cpp
+++ b/src/gui/skin.cpp
@@ -87,9 +87,10 @@ Skin::~Skin()
     delete mStickyImageDown;
 }
 
-void Skin::updateAlpha()
+void Skin::updateAlpha(float minimumOpacityAllowed)
 {
-    const float alpha = config.getValue("guialpha", 0.8);
+    const float alpha = std::max((double)minimumOpacityAllowed,
+                                 config.getValue("guialpha", 0.8f));
 
     for_each(mBorder.grid, mBorder.grid + 9,
              std::bind2nd(std::mem_fun(&Image::setAlpha), alpha));
@@ -112,7 +113,8 @@ int Skin::getMinHeight() const
 }
 
 SkinLoader::SkinLoader()
-    : mSkinConfigListener(new SkinConfigListener(this))
+    : mSkinConfigListener(new SkinConfigListener(this)),
+    mMinimumOpacity(-1.0f)
 {
 }
 
@@ -174,10 +176,18 @@ Skin *SkinLoader::load(const std::string &filename,
     return skin;
 }
 
+void SkinLoader::setMinimumOpacity(float minimumOpacity)
+{
+    if (minimumOpacity > 1.0f) return;
+
+    mMinimumOpacity = minimumOpacity;
+    updateAlpha();
+}
+
 void SkinLoader::updateAlpha()
 {
     for (SkinIterator iter = mSkins.begin(); iter != mSkins.end(); ++iter)
-        iter->second->updateAlpha();
+        iter->second->updateAlpha(mMinimumOpacity);
 }
 
 Skin *SkinLoader::readSkin(const std::string &filename)
@@ -284,6 +294,6 @@ Skin *SkinLoader::readSkin(const std::string &filename)
 
     Skin *skin = new Skin(border, closeImage, stickyImageUp, stickyImageDown,
                           filename);
-    skin->updateAlpha();
+    skin->updateAlpha(mMinimumOpacity);
     return skin;
 }
-- 
cgit v1.2.3-70-g09d2