Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / modules / gui / qt4 / main_interface.hpp

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index e2a59852f1bed0494d9d12aa2d2a5955c2e580e2..a675d87cfd5132c022894e79b7119428bd5a52b9 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -120,6 +120,7 @@ private:
     /* */
     void setMinimalView( bool );
     void setInterfaceFullScreen( bool );
+    void computeMinimumSize();
 
     /* */
     QSettings           *settings;
@@ -153,7 +154,7 @@ private:
 
     /* Flags */
     bool                 b_notificationEnabled; /// Systray Notifications
-    bool                 b_autoresize;          ///< persistent resizeable window
+    bool                 b_autoresize;          ///< persistent resizable window
     bool                 b_videoEmbedded;       ///< Want an external Video Window
     bool                 b_videoFullScreen;     ///< --fullscreen
     bool                 b_videoOnTop;          ///< --video-on-top
@@ -214,13 +215,19 @@ private slots:
 
     void showBuffering( float );
 
-    void resizeStack( int w, int h ) {
+    void resizeStack( int w, int h )
+    {
         if( !isFullScreen() && !isMaximized() )
-            if( b_minimalView ) resize( w, h ); /* Oh yes, it shouldn't
+        {
+            if( b_minimalView )
+                resize( w, h ); /* Oh yes, it shouldn't
                                    be possible that size() - stackCentralW->size() < 0
                                    since stackCentralW is contained in the QMW... */
-            else resize( size() - stackCentralW->size() + QSize( w, h ) );
-        debug(); }
+            else
+                resize( size() - stackCentralW->size() + QSize( w, h ) );
+        }
+        debug();
+    }
 
     void setVideoSize( unsigned int, unsigned int );
     void setVideoFullScreen( bool );