twin: refactor Client::setOpacity() and associated stuffFat-Zer/fix/twin-opacity

* change setOpacity() prototype to receive only opacity.
* rename { setPopupClientOpacity =>  setPopupClientTransparancy() } to
  better reflect what the function does

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/twin/rules.cpp b/twin/rules.cpp
index aa4b7904a..a72c4d195 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -902,12 +902,16 @@ void Client::checkAndSetInitialRuledOpacity()
         rule_opacity_inactive = 0;
 
     return;
-        
+
     if( isDock() )
      //workaround for docks, as they don't have active/inactive settings and don't aut, therefore we take only the active one...
         {
-        uint tmp = rule_opacity_active ? rule_opacity_active : options->dockOpacity;
-        setOpacity(tmp < 0xFFFFFFFF && (rule_opacity_active || options->translucentDocks), tmp);
+        if (rule_opacity_active)
+            setOpacity(rule_opacity_active);
+        else if(options->translucentDocks)
+            setOpacity(options->dockOpacity);
+        else
+            setOpacity(Opacity::Opaque);
         }
     else
         updateOpacity();