SOURCES: kdebase-pager.patch - up

[arekm]

Author: arekm                        Date: Thu Oct  5 06:47:48 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up

---- Files affected:
SOURCES:
   kdebase-pager.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-pager.patch
diff -u SOURCES/kdebase-pager.patch:1.1 SOURCES/kdebase-pager.patch:1.2
--- SOURCES/kdebase-pager.patch:1.1	Thu Oct  5 08:27:10 2006
+++ SOURCES/kdebase-pager.patch	Thu Oct  5 08:47:43 2006
@@ -1,55 +1,54 @@
-diff -Nur kdebase-3.5.5/kicker/applets/minipager/pagerapplet.cpp kdebase-3.5.5.new/kicker/applets/minipager/pagerapplet.cpp
---- kdebase-3.5.5/kicker/applets/minipager/pagerapplet.cpp	2006-10-01 19:31:52.000000000 +0200
-+++ kdebase-3.5.5.new/kicker/applets/minipager/pagerapplet.cpp	2006-10-04 14:44:46.000000000 +0200
-@@ -124,7 +124,7 @@
-     desktopLayoutY = -1;
- 
-     QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
--    m_useViewports = s.width() + s.height() > 1;
-+    m_useViewports = s.width() * s.height() > 1;
- 
-     drawButtons();
- 
-@@ -223,7 +223,8 @@
- 
- void KMiniPager::slotButtonSelected( int desk )
- {
--    if (m_kwin->numberOfViewports(0).width()+m_kwin->numberOfViewports(0).height() > 1)
-+    if (m_kwin->numberOfViewports(m_kwin->currentDesktop()).width() *
-+        m_kwin->numberOfViewports(m_kwin->currentDesktop()).height() > 1)
-     {
-         QPoint p;
- 
-@@ -435,7 +436,7 @@
- {
-     int newDesk;
-     int desktops = KWin::numberOfDesktops();
--    if (m_kwin->numberOfViewports(0).width() + m_kwin->numberOfViewports(0).height() > 1 )
-+    if (m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height() > 1 )
-         desktops = m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height();
-     if (e->delta() < 0)
-     {
-diff -Nur kdebase-3.5.5/kicker/applets/minipager/pagerbutton.cpp kdebase-3.5.5.new/kicker/applets/minipager/pagerbutton.cpp
---- kdebase-3.5.5/kicker/applets/minipager/pagerbutton.cpp	2006-10-01 19:31:52.000000000 +0200
-+++ kdebase-3.5.5.new/kicker/applets/minipager/pagerbutton.cpp	2006-10-04 14:44:46.000000000 +0200
-@@ -116,12 +116,17 @@
-       return false;
- 
-     if (m_useViewports) {
--        QPoint windowSpot = info->frameGeometry().topLeft();
-+        QPoint windowTopLeft = info->frameGeometry().topLeft();
-+        QPoint windowBottomRight = info->frameGeometry().bottomRight();
- 
--        windowSpot += QPoint((m_desktop - m_pager->kwin()->currentViewport(0).x()) *
-+        windowTopLeft += QPoint((m_desktop - m_pager->kwin()->currentViewport(0).x()) *
-+                QApplication::desktop()->width(), 0);
-+        windowBottomRight += QPoint((m_desktop - m_pager->kwin()->currentViewport(0).x()) *
-                 QApplication::desktop()->width(), 0);
- 
--        if (!QApplication::desktop()->screenGeometry().contains(windowSpot))
-+        if (!(info->state() & NET::Sticky) &&
-+            !QApplication::desktop()->geometry().contains(windowTopLeft) &&
-+            !QApplication::desktop()->geometry().contains(windowBottomRight))
-             return false;
-     }
- 
+--- kdebase-3.5.5/kicker/applets/minipager/pagerapplet.cpp.org	2006-10-05 06:43:59.241437000 +0000
++++ kdebase-3.5.5/kicker/applets/minipager/pagerapplet.cpp	2006-10-05 06:45:14.378132750 +0000
+@@ -124,7 +124,7 @@
+     desktopLayoutY = -1;
+ 
+     QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
+-    m_useViewports = s.width() + s.height() > 1;
++    m_useViewports = s.width() * s.height() > 1;
+ 
+     drawButtons();
+ 
+@@ -223,7 +223,7 @@
+ 
+ void KMiniPager::slotButtonSelected( int desk )
+ {
+-    if (m_kwin->numberOfViewports(0).width()+m_kwin->numberOfViewports(0).height() > 1)
++    if (m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height() > 1)
+     {
+         QPoint p;
+ 
+@@ -435,7 +435,7 @@
+ {
+     int newDesk;
+     int desktops = KWin::numberOfDesktops();
+-    if (m_kwin->numberOfViewports(0).width() + m_kwin->numberOfViewports(0).height() > 1 )
++    if (m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height() > 1 )
+         desktops = m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height();
+     if (e->delta() < 0)
+     {
+--- kdebase-3.5.5/kicker/applets/minipager/pagerbutton.cpp.org	2006-10-05 06:44:04.849787500 +0000
++++ kdebase-3.5.5/kicker/applets/minipager/pagerbutton.cpp	2006-10-05 06:46:36.743280250 +0000
+@@ -116,12 +116,17 @@
+       return false;
+ 
+     if (m_useViewports) {
+-        QPoint windowSpot = info->frameGeometry().topLeft();
++	QPoint windowTopLeft = info->frameGeometry().topLeft();
++	QPoint windowBottomRight = info->frameGeometry().bottomRight();
+ 
+-        windowSpot += QPoint((m_desktop - m_pager->kwin()->currentViewport(0).x()) *
+-                QApplication::desktop()->width(), 0);
+-
+-        if (!QApplication::desktop()->screenGeometry().contains(windowSpot))
++	windowTopLeft += QPoint((m_desktop - m_pager->kwin()->currentViewport(0).x()) *
++			QApplication::desktop()->width(), 0);
++	windowBottomRight += QPoint((m_desktop - m_pager->kwin()->currentViewport(0).x()) *
++			QApplication::desktop()->width(), 0);
++
++	if (!(info->state() & NET::Sticky) &&
++			!QApplication::desktop()->geometry().contains(windowTopLeft) &&
++			!QApplication::desktop()->geometry().contains(windowBottomRight))
+             return false;
+     }
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdebase-pager.patch?r1=1.1&r2=1.2&f=u