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

List:       kde-commits
Subject:    kdenox/konq-embed/src
From:       Stefan Eilers <stefan.eilers () basyskom ! de>
Date:       2007-03-19 14:14:34
Message-ID: 1174313674.490472.18997.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 644197 by eilers:

Slightly modified patch from Road: Show preference dialog in fullscreen
modus correctly


 M  +14 -2     mainwindowbase.cc  
 M  +2 -0      mainwindowbase.h  


--- trunk/kdenox/konq-embed/src/mainwindowbase.cc #644196:644197
@@ -105,7 +105,7 @@
 const int MainWindowBase::MAX_ZOOM = 200;
 
 MainWindowBase::MainWindowBase( QWidget *parent, const char *name, WFlags flags )
-    : QMainWindow( parent, name, flags )
+    : QMainWindow( parent, name, flags ), m_isFullScreen( false )
 {
 }
 
@@ -1248,7 +1248,18 @@
     Preferences *pref = new Preferences( this );
 #endif
 #ifdef _QT_QPE_
-    if ( QPEApplication::execDialog(pref) == QDialog::Accepted )
+    bool accepted;
+    if (m_isFullScreen) {
+        pref->resize( qApp->desktop()->size().width(), \
qApp->desktop()->size().height() - ( pref->frameGeometry().height() - \
pref->geometry().height() ) ); +        pref->move(pref->frameGeometry().x() - \
pref->geometry().x(), +                  0);
+        accepted = (pref->exec() == QDialog::Accepted);
+    } else {
+        accepted = (QPEApplication::execDialog(pref) == QDialog::Accepted);
+    }
+
+
+    if ( accepted )
 #else
     if ( pref->exec() == QDialog::Accepted )
 #endif
@@ -1337,6 +1348,7 @@
 
 void MainWindowBase::toggleFullScreen( bool isFullScreen )
 {
+    m_isFullScreen = isFullScreen;
     if ( isFullScreen )
 	showFullScreen();
     else
--- trunk/kdenox/konq-embed/src/mainwindowbase.h #644196:644197
@@ -252,6 +252,8 @@
     static const int ZOOM_STEP;
     static const int MIN_ZOOM;
     static const int MAX_ZOOM;
+
+    bool m_isFullScreen;
 public:
     static int s_statusDelay;
     static uint s_winStyle;


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