From 1ce3c5d673ba7a71f3db5cf7f1d11ee906f92d39 Mon Sep 17 00:00:00 2001 From: Erwan Tulou Date: Thu, 4 Sep 2014 13:40:11 +0200 Subject: [PATCH] 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 --- 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 e0e5c982f3..4285acb790 100644 --- a/modules/gui/skins2/src/top_window.cpp +++ b/modules/gui/skins2/src/top_window.cpp @@ -361,13 +361,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 ); } -- 2.11.4.GIT