From 2a610411f40ae1a231a30da05b2f20c5e8216157 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Sun, 15 Mar 2009 18:26:17 +0000
Subject: Add missing patch. (Portage version: 2.2_rc25/cvs/Linux x86_64)

---
 kde-base/plasma-workspace/ChangeLog                |  6 +++-
 .../files/4.2-fix-quicklaunch.patch                | 42 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch

(limited to 'kde-base')

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 734d39ce3f8c..44ea36952570 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.13 2009/03/15 14:43:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.14 2009/03/15 18:26:17 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/4.2-fix-quicklaunch.patch:
+  Add missing patch.
 
 *plasma-workspace-4.2.1-r1 (15 Mar 2009)
 
diff --git a/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch b/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch
new file mode 100644
index 000000000000..ad6ba1c4654a
--- /dev/null
+++ b/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch
@@ -0,0 +1,42 @@
+--- kdebase-workspace-4.2.1-orig/plasma/applets/quicklaunch/quicklaunchApplet.cpp	2009-02-26 15:17:02.000000000 +0100
++++ kdebase-workspace-4.2.1/plasma/applets/quicklaunch/quicklaunchApplet.cpp	2009-03-08 13:53:49.000000000 +0100
+@@ -44,6 +44,8 @@
+ 
+ QuicklaunchApplet::QuicklaunchApplet(QObject *parent, const QVariantList &args)
+   : Plasma::Applet(parent, args),
++    m_layout(0),
++    m_innerLayout(0),
+     m_visibleIcons(6),
+     m_rowCount(2),
+     m_dialogRowCount(2),
+@@ -53,9 +55,7 @@
+     m_addDialog(0),
+     m_rightClickedIcon(0),
+     m_addAction(0),
+-    m_removeAction(0),
+-    m_layout(0),
+-    m_innerLayout(0)
++    m_removeAction(0)
+ {
+     setHasConfigurationInterface(true);
+     setAcceptDrops(true);
+@@ -141,16 +141,11 @@
+         if (!m_innerLayout) {
+             return sizeHint;
+         }
++        qreal newWidth = m_innerLayout->columnCount() * sizeHint.height() / qMax(1, m_innerLayout->rowCount());
+         if (m_icons.size() > m_visibleIcons) {
+-            qreal factor = m_innerLayout->rowCount() * m_innerLayout->columnCount() + size().height();
+-            if (factor) {
+-                sizeHint.setWidth(sizeHint.height() / factor);
+-            }
++            sizeHint.setWidth(newWidth + sizeHint.height());
+         } else {
+-            qreal factor = m_innerLayout->rowCount() * m_innerLayout->columnCount();
+-            if (factor) {
+-                sizeHint.setWidth(sizeHint.height() / factor);
+-            }
++            sizeHint.setWidth(newWidth);
+         }
+         return sizeHint;
+     }
-- 
cgit v1.2.3-65-gdbad