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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/shells/desktop
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-11-19 1:31:18
Message-ID: 1227058278.147839.7378.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 886347 by aseigo:

try and detect screen move


 M  +7 -1      desktopview.cpp  
 M  +1 -0      desktopview.h  
 M  +4 -3      plasmaapp.cpp  


--- trunk/KDE/kdebase/workspace/plasma/shells/desktop/desktopview.cpp #886346:886347
@@ -107,7 +107,7 @@
 
     Kephal::Screens *screens = Kephal::Screens::self();
     connect(screens, SIGNAL(screenResized(Kephal::Screen *, QSize, QSize)), SLOT(adjustSize()));
-    connect(screens, SIGNAL(screenMoved(Kephal::Screen *, QPoint, QPoint)), SLOT(adjustSize()));
+    connect(screens, SIGNAL(screenMoved(Kephal::Screen *, QPoint, QPoint)), SLOT(screenMoved()));
 }
 
 DesktopView::~DesktopView()
@@ -143,6 +143,12 @@
     kDebug() << "toggling dashboard for screen" << screen() << m_dashboard->isVisible();
 }
 
+void DesktopView::screenMoved()
+{
+    kDebug() << screen();
+    adjustSize();
+}
+
 void DesktopView::adjustSize()
 {
     // adapt to screen resolution changes
--- trunk/KDE/kdebase/workspace/plasma/shells/desktop/desktopview.h #886346:886347
@@ -52,6 +52,7 @@
     void zoomIn(Plasma::ZoomLevel zoomLevel);
     void zoomOut(Plasma::ZoomLevel zoomLevel);
     void toggleDashboard();
+    void screenMoved();
     void adjustSize();
 
     void screenOwnerChanged(int wasScreen, int isScreen, Plasma::Containment* containment);
--- trunk/KDE/kdebase/workspace/plasma/shells/desktop/plasmaapp.cpp #886346:886347
@@ -536,17 +536,18 @@
         default:
             if (containment->screen() > -1 &&
                 containment->screen() < Kephal::ScreenUtils::numScreens()) {
-                if (viewForScreen(containment->screen(), containment->desktop())) {
+                DesktopView *view = viewForScreen(containment->screen(), containment->desktop());
+                if (view) {
                     kDebug() << "had a view for" << containment->screen() << containment->desktop();
                     // we already have a view for this screen
                     return;
                 }
 
-                kDebug() << "creating a view for" << containment->screen() << containment->desktop()
+                kDebug() << "creating a new view for" << containment->screen() << containment->desktop()
                          << "and we have" << Kephal::ScreenUtils::numScreens() << "screens";
 
                 // we have a new screen. neat.
-                DesktopView *view = new DesktopView(containment, id, 0);
+                view = new DesktopView(containment, id, 0);
                 viewWindow = view->winId();
                 if (m_corona) {
                     connect(m_corona, SIGNAL(screenOwnerChanged(int,int,Plasma::Containment*)),
[prev in list] [next in list] [prev in thread] [next in thread]