rpms/kdebase-workspace/F-10 kdebase-workspace-4.3.0-desktopnumbers.patch, NONE, 1.1 kdebase-workspace.spec, 1.166, 1.167

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14418/F-10

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-desktopnumbers.patch 
Log Message:
fix pager not displaying desktop numbers (kdebug#184152)


kdebase-workspace-4.3.0-desktopnumbers.patch:

--- NEW FILE kdebase-workspace-4.3.0-desktopnumbers.patch ---
--- plasma/applets/pager/pager.cpp	2009/02/28 02:35:49	933128
+++ plasma/applets/pager/pager.cpp	2009/02/28 02:46:32	933129
@@ -1118,8 +1118,13 @@
             QRectF target = m_rects[i];
             //take also shadow position and radius into account
             //kDebug() << target << result.height();
-            if (target.height() >= result.height() - radius * 2) {
-                QPointF paintPoint = target.center() - (result.rect().center() + QPoint(radius, radius)); 
+
+            // for the default size of the panel we can allow this "one pixel"
+            // offset on the bottom. the applet is so small that you almost
+            // can't see the offset and this brings back the labels for the
+            // panel's default size.
+            if (target.height() + 1 >= result.height() - radius * 2) {
+                QPointF paintPoint = target.center() - (result.rect().center() + QPoint(radius, radius));
 
                 if (paintPoint.x() + radius < target.x() + 1) {
                     paintPoint.setX(target.x() + 1 - radius);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kdebase-workspace.spec	9 Mar 2009 15:23:54 -0000	1.166
+++ kdebase-workspace.spec	9 Mar 2009 17:25:04 -0000	1.167
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.1
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -44,6 +44,8 @@
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
 # 4.2 , http://bugs.kde.org/185736
 Patch104: kdebase-workspace-4.2.1-kde#185736.patch
+#Â 4.3, https://bugs.kde.org/show_bug.cgi?id=184152
+Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
 
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
@@ -225,7 +227,7 @@
 %endif
 %patch103 -p1 -b .kde#180576
 %patch104 -p5 -b .kde#185736
-
+%patch105 -p0 -b .desktopnumbers
 
 %build
 
@@ -374,6 +376,9 @@
 
 
 %changelog
+* Mon Mar  9 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-5
+- fix pager not displaying desktop numbers (kdebug#184152)
+
 * Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-4
 - kde 4.2 update crashes plasma (kdebug#185736)