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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/shell
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-11-20 22:53:22
Message-ID: 20101120225322.DD502AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199166 by aseigo:

don't auothide no matter what if there is editting in play


 M  +7 -3      panelview.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/panelview.cpp #1199165:1199166
@@ -615,7 +615,7 @@
             m_mousePollTimer->stop();
         }
 
-        QTimer::singleShot(2000, this, SLOT(startAutoHide()));
+        QTimer::singleShot(2000, this, SLOT(hideIfNotInUse()));
     }
 
     KWindowSystem::setOnAllDesktops(winId(), true);
@@ -1286,7 +1286,11 @@
     }
 
     if (!m_panelController) {
-        PlasmaApp::self()->showWidgetExplorer(screen(), containment());
+        m_editing = true;
+        ControllerWindow *controller = \
PlasmaApp::self()->showWidgetExplorer(screen(), containment()); +        \
connect(controller, SIGNAL(destroyed(QObject*)), this, SLOT(editingComplete()), \
Qt::UniqueConnection); +    } else {
+        m_panelController->showWidgetExplorer();
     }
 }
 
@@ -1330,7 +1334,7 @@
 {
     //kDebug() << m_delayedUnhideTs.elapsed() << geometry().contains(QCursor::pos()) \
<< hasPopup();  //TODO: is 5s too long? not long enough?
-    if ((m_delayedUnhideTs.isNull() || m_delayedUnhideTs.elapsed() > 5000) &&
+    if ((m_delayedUnhideTs.isNull() || m_delayedUnhideTs.elapsed() > 5000) && \
                !m_editing &&
         !geometry().adjusted(-10, -10, 10, 10).contains(QCursor::pos()) && \
!hasPopup()) {  startAutoHide();
     }


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