[vlc-commits] skins2: fix animated image flickering

[Erwan Tulou]

vlc/vlc-2.2 | branch: master | Erwan Tulou <erwan10 at videolan.org> | Thu Sep  4 13:40:11 2014 +0200| [0812cc88be39c4a99ad8ab6bf0b072b45a3d50db] | committer: Felix Paul Kühne

skins2: fix animated image flickering

Switch the layout activity to true before actually displaying the layout. This
gives controls a chance to reinitialize before any real drawing occurs, and
thus a clean animation gets displayed without any unwanted stray image.

This fixes trac #12083

(cherry picked from commit 1ce3c5d673ba7a71f3db5cf7f1d11ee906f92d39)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=0812cc88be39c4a99ad8ab6bf0b072b45a3d50db
---

 modules/gui/skins2/src/top_window.cpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/gui/skins2/src/top_window.cpp b/modules/gui/skins2/src/top_window.cpp
index d65a80e..11b0d0d 100644
--- a/modules/gui/skins2/src/top_window.cpp
+++ b/modules/gui/skins2/src/top_window.cpp
@@ -382,13 +382,14 @@ void TopWindow::setActiveLayout( GenericLayout *pLayout )
     // Get the size of the layout and resize the window
     resize( pLayout->getWidth(), pLayout->getHeight() );
 
+    // The new layout is active
+    pLayout->getActiveVar().set( true );
+
     if( isVisible )
     {
         pLayout->onShow();
     }
 
-    // The new layout is active
-    pLayout->getActiveVar().set( true );
 }