rev 4591 - trunk/packages/kdebase/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-10-04 23:04:01 +0000 (Wed, 04 Oct 2006)
New Revision: 4591

Added:
   trunk/packages/kdebase/debian/patches/02_minipager_fixes_branch.diff
Log:
Grabbed from branch, as per IRC request.


Added: trunk/packages/kdebase/debian/patches/02_minipager_fixes_branch.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/02_minipager_fixes_branch.diff	                        (rev 0)
+++ trunk/packages/kdebase/debian/patches/02_minipager_fixes_branch.diff	2006-10-04 23:04:01 UTC (rev 4591)
@@ -0,0 +1,54 @@
+#DPATCHLEVEL=0
+--- kicker/applets/minipager/pagerapplet.cpp	(.../tags/KDE/3.5.5/kdebase)	(revision 592494)
++++ kicker/applets/minipager/pagerapplet.cpp	(.../branches/KDE/3.5/kdebase)	(revision 592494)
+@@ -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)
+     {
+--- kicker/applets/minipager/pagerbutton.cpp	(.../tags/KDE/3.5.5/kdebase)	(revision 592494)
++++ kicker/applets/minipager/pagerbutton.cpp	(.../branches/KDE/3.5/kdebase)	(revision 592494)
+@@ -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;
+     }
+