[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2008-03-10 23:34:02
Message-ID: 1205192042.586604.17343.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 784344 by lunakl:

The same like r784333 - remove broken usage of QWidget::showFullScreen() etc.



 M  +2 -2      kpresenter/part/KPrViewModePresentation.cpp  
 M  +2 -2      libs/main/KoMainWindow.cpp  


--- trunk/koffice/kpresenter/part/KPrViewModePresentation.cpp #784343:784344
@@ -112,7 +112,7 @@
     m_savedViewMode = previousViewMode;               // store the previous view \
mode  m_savedParent = m_canvas->parentWidget();
     m_canvas->setParent( ( QWidget* )0, Qt::Window ); // set parent to 0 and
-    m_canvas->showFullScreen();                       // detach widget to make
+    m_canvas->setWindowState( m_canvas->windowState() | Qt::WindowFullScreen ); // \
                detach widget to make
     m_canvas->setFocus();                             // it shown full screen
 
     m_animationDirector = new KPrAnimationDirector( m_view, \
m_view->kopaDocument()->pages(), m_view->activePage() ); @@ -122,7 +122,7 @@
 {
     m_canvas->setParent( m_savedParent, Qt::Widget );
     m_canvas->setFocus();
-    m_canvas->showNormal();
+    m_canvas->setWindowState( m_canvas->windowState() & ~Qt::WindowFullScreen ); // \
reset  m_view->updateActivePage(m_view->activePage());
     delete m_animationDirector;
     m_animationDirector = 0;
--- trunk/koffice/libs/main/KoMainWindow.cpp #784343:784344
@@ -1563,10 +1563,10 @@
 {
     //TODO optional hide toolbars, statusbar, dockers, etc. Probably introduce own \
'view modes' with there own kconfig-settings  if(fullScreen) {
-        showFullScreen();
+        setWindowState( windowState() | Qt::WindowFullScreen ); // set
     }
     else {
-        showNormal();
+        setWindowState( windowState() & ~Qt::WindowFullScreen ); // reset
     }
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]