skins2: setOpacity moved to a better place

Opacity used to work only on newly loaded skins, but failed to work from
skins restored from a previous session.

diff --git a/modules/gui/skins2/src/window_manager.cpp b/modules/gui/skins2/src/window_manager.cpp
index 00dcf7156e81e0aaa6960c9e64b57dd37638750b..ed01b0612b1895d5f801e3f236e09a6450905ece 100644 (file)
--- a/modules/gui/skins2/src/window_manager.cpp
+++ b/modules/gui/skins2/src/window_manager.cpp
@@ -425,7 +425,6 @@ void WindowManager::showAll( bool firstTime ) const
         {
             (*it)->show();
         }
-        (*it)->setOpacity( m_alpha );
     }
 }
 

diff --git a/modules/gui/skins2/src/window_manager.hpp b/modules/gui/skins2/src/window_manager.hpp
index 4849f552dc19c13f2925a3f2b2762f7e754ba364..6a689f199e6be69ff4db96d1fc8367754da5f360 100644 (file)
--- a/modules/gui/skins2/src/window_manager.hpp
+++ b/modules/gui/skins2/src/window_manager.hpp
@@ -120,7 +120,8 @@ public:
     void raise( TopWindow &rWindow ) const { rWindow.raise(); }
 
     /// Show the given window
-    void show( TopWindow &rWindow ) const { rWindow.show(); }
+    void show( TopWindow &rWindow ) const
+        { rWindow.show(); rWindow.setOpacity( m_alpha); }
 
     /// Hide the given window
     void hide( TopWindow &rWindow ) const { rWindow.hide(); }