vlc/vlc-1.2 | branch: master | Edward Wang <[email protected]> | Mon Jan 2 23:57:36 2012 -0500| [955adb074f15c46a1a21447dab9bbbc1ee915444] | committer: Jean-Baptiste Kempf
Qt4: Fix a small playlist docking bug Fix a small playlist docking bug where the playlistWidget is not properly set as a Qt::Widget, causing it to behave inappropriately. Close #5773 Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit 6a0131dae6a119a72fbec2bce995ca1dfcd9b5be) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=955adb074f15c46a1a21447dab9bbbc1ee915444 --- modules/gui/qt4/main_interface.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index f0323d5..2ac2397 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -856,13 +856,13 @@ void MainInterface::dockPlaylist( bool p_docked ) } else /* Previously undocked */ { - /* If playlist is invisible don't show it */ - if( !playlistWidget->isVisible() ) return; - QVLCTools::saveWidgetPosition( p_intf, "Playlist", playlistWidget ); playlistWidget->setWindowFlags( Qt::Widget ); // Probably a Qt bug here // It would be logical that QStackWidget::addWidget reset the flags... stackCentralW->addWidget( playlistWidget ); + + /* If playlist is invisible don't show it */ + if( !playlistWidget->isVisible() ) return; showTab( playlistWidget ); } playlistVisible = true; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
