From dae6ab4156fa761db824f06abca9955338ee4a0e Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Thu, 9 Apr 2015 16:03:37 +0100 Subject: [PATCH] Fix minor issues when changing window modes. toolbars are not configured yet --- app/PlaYUVerSubWindowHandle.cpp | 8 +++++--- app/PlotSubWindow.cpp | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/PlaYUVerSubWindowHandle.cpp b/app/PlaYUVerSubWindowHandle.cpp index 904dd2d..d37ff26 100644 --- a/app/PlaYUVerSubWindowHandle.cpp +++ b/app/PlaYUVerSubWindowHandle.cpp @@ -113,15 +113,18 @@ Void PlaYUVerSubWindowHandle::setWindowMode( Int iWindowMode ) m_apcSubWindowList.at( i )->sizeHint(); m_apcSubWindowList.at( i )->show(); } - + setVisible( false ); + parentWidget()->update(); + parentWidget()->showNormal(); + qApp->processEvents(); QSize screenSize = QApplication::desktop()->availableGeometry().size(); parentWidget()->move( 0, 0 ); parentWidget()->resize( screenSize.width(), 5 ); - setVisible( false ); } if( iWindowMode == MdiWSubWindows ) { + setVisible( true ); m_pcMdiArea = new PlaYUVerMdiArea( this ); m_pcMdiArea->setActivationOrder( QMdiArea::ActivationHistoryOrder ); connect( m_pcMdiArea, SIGNAL( subWindowActivated(QMdiSubWindow*) ), this, SLOT( updateActiveSubWindow() ) ); @@ -134,7 +137,6 @@ Void PlaYUVerSubWindowHandle::setWindowMode( Int iWindowMode ) } parentWidget()->move( m_cMdiModeWindowPosition ); parentWidget()->resize( m_cMdiModeWindowSize ); - setVisible( true ); } m_iWindowMode = iWindowMode; tileSubWindows(); diff --git a/app/PlotSubWindow.cpp b/app/PlotSubWindow.cpp index a3c7b2a..ba0bc4d 100644 --- a/app/PlotSubWindow.cpp +++ b/app/PlotSubWindow.cpp @@ -39,6 +39,12 @@ Void PlotSubWindow::definePlotColors() m_arrayColorList.append( Qt::yellow ); m_arrayColorList.append( Qt::gray ); m_arrayColorList.append( Qt::darkRed ); + m_arrayColorList.append( Qt::darkGreen ); + m_arrayColorList.append( Qt::darkRed ); + m_arrayColorList.append( Qt::darkBlue ); + m_arrayColorList.append( Qt::darkMagenta ); + m_arrayColorList.append( Qt::darkCyan ); + m_arrayColorList.append( Qt::darkYellow ); } PlotSubWindow::PlotSubWindow( const QString& windowTitle, QWidget * parent ) :