[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-23 22:23:59
Message-ID: 20101123222359.62531AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1200097 by aseigo:

don't null out the containment if it is a desktop # change that we don't care about \
(because we aren't doing PVD)


 M  +16 -3     desktopview.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/desktopview.cpp #1200096:1200097
@@ -276,6 +276,7 @@
 {
     Plasma::Containment *oldContainment = this->containment();
     if (m_init && containment == oldContainment) {
+        //kDebug() << "initialized and containment is the same, aborting";
         return;
     }
 
@@ -356,17 +357,29 @@
 
 void DesktopView::screenOwnerChanged(int wasScreen, int isScreen, \
Plasma::Containment* newContainment)  {
-    //kDebug() << "was:" << wasScreen << "is:" << isScreen << "my screen:" << \
screen() << "containment:" << (QObject*)newContainment << newContainment->activity() \
<< "myself:" << (QObject*)this <<"containment desktop:"<<newContainment->desktop() << \
"my desktop:"<<containment()->desktop();  if \
(PlasmaApp::isPanelContainment(newContainment)) {  // we don't care about panel \
containments changing screens on us  return;
     }
 
-    if (wasScreen == screen() && this->containment() == newContainment) {
+    /*
+    kDebug() << "was:" << wasScreen << "is:" << isScreen << "my screen:" << screen()
+             << "containment:" << (QObject *)newContainment << \
newContainment->activity() +             << "current containment" << (QObject \
*)containment()  +             << "myself:" << (QObject *)this
+             << "containment desktop:" << newContainment->desktop() << "my desktop:" \
<< m_desktop; +    */
+
+    if (containment() == newContainment &&
+        wasScreen == screen() &&
+        (isScreen != wasScreen || AppSettings::perVirtualDesktopViews())) {
+        //kDebug() << "nulling out containment";
         setContainment(0);
     }
 
-    if (isScreen > -1 && isScreen == screen() && \
(!AppSettings::perVirtualDesktopViews() || newContainment->desktop() == m_desktop - \
1) ) { +    if (isScreen > -1 && isScreen == screen() &&
+        (!AppSettings::perVirtualDesktopViews() || newContainment->desktop() == \
m_desktop - 1) ) { +        //kDebug() << "setting new containment";
         setContainment(newContainment);
     }
 }


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