X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmain_interface.hpp;h=689da2b457f1ba30dd0ec09827569f7941d913b9;hb=ba394d11c884ee2cbf703d7b6cddccafa96cff74;hp=016c53b45ef48970d2212133b1da980342ef2d5b;hpb=961e494b74575ea569e8f761e6a7896fb1b38f19;p=vlc

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 016c53b45e..689da2b457 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * main_interface.hpp : Main Interface
  ****************************************************************************
- * Copyright (C) 2006-2008 the VideoLAN team
+ * Copyright (C) 2006-2010 VideoLAN and AUTHORS
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -64,7 +64,7 @@ enum {
 
 class MainInterface : public QVLCMW
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     friend class PlaylistWidget;
 
@@ -100,7 +100,6 @@ protected:
     virtual void customEvent( QEvent *);
     virtual void keyPressEvent( QKeyEvent *);
     virtual void wheelEvent( QWheelEvent * );
-    virtual void resizeEvent( QResizeEvent * event );
 
 private:
     /* Main Widgets Creation */
@@ -116,7 +115,6 @@ private:
     /* Central StackWidget Management */
     void showTab( QWidget *);
     void showVideo();
-    void showBg();
     void restoreStackOldWidget();
 
     /* */
@@ -147,21 +145,21 @@ private:
     /* Status and flags */
     QWidget             *stackCentralOldWidget;
 
+    QMap<QWidget *, QSize> stackWidgetsSizes;
+
     /* Flags */
     bool                 b_notificationEnabled; /// Systray Notifications
-    bool                 b_keep_size;         ///< persistent resizeable window
-    bool                 b_videoEmbedded;   ///< Want an external Video Window
+    bool                 b_autoresize;          ///< persistent resizeable window
+    bool                 b_videoEmbedded;       ///< Want an external Video Window
     bool                 b_hideAfterCreation;
-    int                  i_visualmode;        ///< Visual Mode
+    int                  i_visualmode;          ///< Visual Mode
 
     /* States */
-    bool                 playlistVisible;     ///< Is the playlist visible ?
+    bool                 playlistVisible;       ///< Is the playlist visible ?
 //    bool                 videoIsActive;       ///< Having a video now / THEMIM->hasV
 //    bool                 b_visualSelectorEnabled;
-    bool                 b_plDocked;          ///< Is the playlist docked ?
+    bool                 b_plDocked;            ///< Is the playlist docked ?
 
-    QSize                mainBasedSize;       ///< based Wnd (normal mode only)
-    QSize                mainVideoSize;       ///< Wnd with video (all modes)
 
 #ifdef WIN32
     HIMAGELIST himl;
@@ -210,7 +208,8 @@ private slots:
     void showBuffering( float );
 
     void resizeStack( int w, int h ) {
-        resize( size() - stackCentralW->size() + QSize( w, h ) );
+        if( !isFullScreen() && !isMaximized() )
+            resize( size() - stackCentralW->size() + QSize( w, h ) );
         debug(); }