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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/shell
From:       Alex Fiestas <alex () eyeos ! org>
Date:       2010-08-01 0:38:23
Message-ID: 20100801003823.6E2C2AC783 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1157720 by afiestas:

Show ActivityManager and WidgetExplorer in the screen where they were launched.


 M  +11 -1     controllerwindow.cpp  
 M  +1 -1      plasmaapp.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/controllerwindow.cpp \
#1157719:1157720 @@ -209,7 +209,17 @@
         getContentsMargins(&left, &top, &right, &bottom);
 
         QDesktopWidget *desktop = QApplication::desktop();
-        QRect screenRect = \
Kephal::ScreenUtils::screenGeometry(Kephal::ScreenUtils::screenId(pos())); +
+        QRect screenRect;
+        //Try to use the screenId directly from the containment, because it won't \
fail. +        //If we dont' have containment. try to get the screen by using \
QWidget::pos(), but it +        //may fail if syncToGraphicsWidget is called before a \
real position is set (so pos() will +        //just return 0x0, which may lead to the \
wrong screen +        if (m_containment) {
+            screenRect = \
Kephal::ScreenUtils::screenGeometry(m_containment.data()->screen()); +        } else \
{ +            screenRect = \
Kephal::ScreenUtils::screenGeometry(Kephal::ScreenUtils::screenId(pos())); +        }
         QSize maxSize = KWindowSystem::workArea().intersect(screenRect).size();
 
         QSize windowSize;
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/plasmaapp.cpp #1157719:1157720
@@ -523,7 +523,7 @@
 
     if (!moved) {
         // set it to the bottom of the screen as we have no better hints to go by
-        QRect geom = KWindowSystem::workArea();
+        QRect geom = Kephal::Screens::self()->screen(screen)->geom();
         controller->resize(controller->sizeHint());
         controller->setGeometry(geom.x(), geom.bottom() - controller->height(), \
geom.width(), controller->height());  }


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