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

List:       kde-commits
Subject:    extragear/utils/yakuake
From:       Eike Hein <hein () kde ! org>
Date:       2009-03-30 18:54:41
Message-ID: 1238439281.119073.3331.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 947014 by hein:

Switch back to the pre-r946995 behavior of not switching from
fullscreen to normal window geometry when toggling the window
state while in fullscreen mode. Nobody ever complained about
the old behavior, and this feels less hacky code-wise.


 M  +1 -1      ChangeLog  
 M  +2 -17     app/mainwindow.cpp  
 M  +0 -1      app/mainwindow.h  


--- trunk/extragear/utils/yakuake/ChangeLog #947013:947014
@@ -31,7 +31,7 @@
   the position of the mouse pointer against the actual position and width of
   the window rather than triggering on the entire screen edge. This way, the
   screen corners are freed up e.g. for KWin Desktop Effects triggers with
-  the default Yakuake window width of 90%.
+  the default Yakuake window width of 90% work area width.
 * Rewrote fullscreen handling, fixing bugs such as exiting fullscreen mode
   on virtual desktop switch.
 
--- trunk/extragear/utils/yakuake/app/mainwindow.cpp #947013:947014
@@ -72,8 +72,6 @@
     m_titleBar = new TitleBar(this);
     m_firstRunDialog = NULL;
 
-    m_togglingWindowState = false;
-
     setupActions();
     setupMenu();
 
@@ -747,8 +745,6 @@
 
 void MainWindow::toggleWindowState()
 {
-    m_togglingWindowState = true;
-
     if (m_animationTimer.isActive()) return;
 
     if (isVisible())
@@ -759,13 +755,6 @@
             return;
         }
 
-        QAction* action = actionCollection()->action("view-full-screen");
-        if (action->isChecked())
-        {
-            action->setChecked(false);
-            applyWindowGeometry();
-        }
-
         m_animationFrame = Settings::frames();
 
         connect(&m_animationTimer, SIGNAL(timeout()), this, SLOT(retractWindow()));
@@ -780,8 +769,6 @@
         connect(&m_animationTimer, SIGNAL(timeout()), this, SLOT(openWindow()));
         m_animationTimer.start();
     }
-
-    m_togglingWindowState = false;
 }
 
 void MainWindow::openWindow()
@@ -886,10 +873,8 @@
     }
     else
     {
-        this->setWindowState(windowState() & ~Qt::WindowFullScreen);
-
-        if (!m_togglingWindowState)
-            setWindowGeometry(Settings::width(), Settings::height(), Settings::position());
+        setWindowState(windowState() & ~Qt::WindowFullScreen);
+        setWindowGeometry(Settings::width(), Settings::height(), Settings::position());
     }
 }
 
--- trunk/extragear/utils/yakuake/app/mainwindow.h #947013:947014
@@ -162,7 +162,6 @@
         QTimer m_mousePoller;
         int m_animationFrame;
         int m_animationStepSize;
-        bool m_togglingWindowState;
 };
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]