From d197ab14643cb52c0d34fc5791ffe4ca3d7edfcb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Sat, 23 Aug 2008 01:53:07 -0400 Subject: [PATCH] This is an attempt to close '#1716' (zoom has to be clicked twice) The only thing it does is re-calculating the sizeHint for MainInterface, using videoWidget's sizeHint() instead of size(). --- modules/gui/qt4/main_interface.cpp | 14 ++++++++------ modules/gui/qt4/main_interface.hpp | 3 +-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index 7ea77b65fb..10f6bdcbbe 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -540,7 +540,7 @@ int MainInterface::privacyDialog( QList *controls ) ask _parent->isFloating()... If you think this would be better, please FIXME it... */ -#if 0 + QSize MainInterface::sizeHint() const { int nwidth = controls->sizeHint().width(); @@ -559,20 +559,22 @@ QSize MainInterface::sizeHint() const } else if( videoIsActive ) { - nheight += videoWidget->size().height(); - nwidth = videoWidget->size().width(); + nheight += videoWidget->sizeHint().height(); + nwidth = videoWidget->sizeHint().width(); msg_Dbg( p_intf, "2 %i %i", nheight, nwidth ); } -/* if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget() ) +#if 0 + if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget() ) { nheight += dockPL->size().height(); nwidth = __MAX( nwidth, dockPL->size().width() ); msg_Dbg( p_intf, "3 %i %i", nheight, nwidth ); - }*/ + } +#endif msg_Dbg( p_intf, "4 %i %i", nheight, nwidth ); return QSize( nwidth, nheight ); } -#endif + #if 0 /* FIXME This is dead code and need to be removed AT THE END */ void MainInterface::resizeEvent( QResizeEvent *e ) diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp index a0037775af..a819ed008f 100644 --- a/modules/gui/qt4/main_interface.hpp +++ b/modules/gui/qt4/main_interface.hpp @@ -83,9 +83,8 @@ public: QMenu *getSysTrayMenu() { return systrayMenu; }; int getControlsVisibilityStatus(); -#if 0 /* Sizehint() */ + /* Sizehint() */ QSize sizeHint() const; -#endif protected: // void resizeEvent( QResizeEvent * ); void dropEvent( QDropEvent *); -- 2.39.2