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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2007-01-17 15:57:06
Message-ID: 1169049426.947091.6087.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 624656 by lunakl:

This desktopIconsArea stuff is rather broken with multiple monitors,
since caring about screen number does not actually seem necessary,
just ignore it, should be okay for 3.5.x . Since this code has apparently
never made it to trunk, I don't care more. I wonder what was the point
of inventing a completely different way of something that exist anyway.



 M  +3 -1      kdesktop/desktop.cc  
 M  +4 -1      kicker/kicker/core/extensionmanager.cpp  


--- branches/KDE/3.5/kdebase/kdesktop/desktop.cc #624655:624656
@@ -744,7 +744,9 @@
     else if (screen == -1)
        screen = kapp->desktop()->primaryScreen();
 
-    if ( (screen == kdesktop_screen_number) && m_pIconView )
+    // This is pretty broken, mixes Xinerama and non-Xinerama multihead
+    // and generally doesn't seem to be required anyway => ignore screen.
+    if ( /*(screen == kdesktop_screen_number) &&*/ m_pIconView )
         m_pIconView->updateWorkArea(area);
 }
 
--- branches/KDE/3.5/kdebase/kicker/kicker/core/extensionmanager.cpp #624655:624656
@@ -738,7 +738,10 @@
 
 QRect ExtensionManager::desktopIconsArea(int screen) const
 {
-    QRect area = QApplication::desktop()->screenGeometry(screen);
+    // This is pretty broken, mixes Xinerama and non-Xinerama multihead
+    // and generally doesn't seem to be required anyway => ignore screen.
+//    QRect area = QApplication::desktop()->screenGeometry(screen);
+    QRect area = QApplication::desktop()->geometry();
 
     reduceArea(area, m_mainPanel);
     reduceArea(area, m_menubarPanel);
[prev in list] [next in list] [prev in thread] [next in thread]