From kde-core-devel  Wed Jan 14 17:01:33 2004
From: Sandro Giessl <ceebx () users ! sourceforge ! net>
Date: Wed, 14 Jan 2004 17:01:33 +0000
To: kde-core-devel
Subject: Patch for Plastik bug 69822
Message-Id: <200401141801.33853.ceebx () users ! sourceforge ! net>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=107410343815027
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--Boundary-00=_tXXBABNkYtt07W8"


--Boundary-00=_tXXBABNkYtt07W8
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi,

This small patch fixes bug 69822 ("Changing widget style make desktop 
bar to small") by removing the implementation of CT_MenuBar and falling 
back to the default which works fine.
I consider #69822 as grave because it makes MacOs-style menus sort of 
unusable, ok commit?

Sandro

--Boundary-00=_tXXBABNkYtt07W8
Content-Type: text/x-diff;
  charset="us-ascii";
  name="plastik_69822.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="plastik_69822.diff"

? plastik_topmenu.diff
Index: plastik.cpp
===================================================================
RCS file: /home/kde/kdeartwork/styles/plastik/plastik.cpp,v
retrieving revision 1.28
diff -u -p -b -r1.28 plastik.cpp
--- plastik.cpp	4 Jan 2004 16:18:46 -0000	1.28
+++ plastik.cpp	14 Jan 2004 16:50:08 -0000
@@ -2828,19 +2828,6 @@ QSize PlastikStyle::sizeFromContents(Con
                                     const QStyleOption &opt) const
 {
     switch (t) {
-        case CT_MenuBar: {
-            const QMenuBar *mb = (const QMenuBar *)widget;
-            int w, h;
-            {
-                h = QFontInfo(mb->font()).pixelSize() + 4;
-                w = 10;
-            }
-
-            return QSize(w, h);
-
-            break;
-        }
-
         case CT_PopupMenuItem: {
             if (!widget || opt.isDefault())
                 return s;

--Boundary-00=_tXXBABNkYtt07W8--