Magellan Linux

Contents of /trunk/qt/patches/qt-3.3.4-0047-fix-kmenu-widget.diff

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (show annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 992 byte(s)
-import

1 qt-bugs@ issue: N46882
2 bugs.kde.org number: 77545
3 applied: no
4 author: Stephan Binner <binner@kde.org>
5
6 Fix wrong K menu width for the case of enabled side pixmap and a menu title
7 (like "Recently Used Applications") being longer than every other entry.
8
9 Solution: Respect PanelKMenu::setMaximumSize() as up to Qt 3.2.3
10
11 Index: src/widgets/qpopupmenu.cpp
12 ===================================================================
13 RCS file: /home/kde/qt-copy/src/widgets/qpopupmenu.cpp,v
14 retrieving revision 1.60
15 diff -u -3 -p -b -r1.60 qpopupmenu.cpp
16 --- src/widgets/qpopupmenu.cpp 29 Apr 2004 22:31:28 -0000 1.60
17 +++ src/widgets/qpopupmenu.cpp 30 Apr 2004 01:11:59 -0000
18 @@ -2531,7 +2531,7 @@ QSize QPopupMenu::sizeHint() const
19
20 QPopupMenu* that = (QPopupMenu*) this;
21 //We do not need a resize here, just the sizeHint..
22 - return that->updateSize(FALSE, FALSE).expandedTo( QApplication::globalStrut() );
23 + return that->updateSize(FALSE).expandedTo( QApplication::globalStrut() );
24 }
25