x11-libs/qt/files/qt-3.3.4-0051-qtoolbar_77047.patch

   1 qt-bugs@ issue : 54405
   2 applied: no
   3 author: Waldo Bastian <bastian@kde.org>
   4
   5 KToolBarButton always uses a non-zero popup-delay because we would like
   6 to draw the menu-indicator on the toolbar buttons ourselves. Unfortunately
   7 that means that the menu-item in the toolbar-extension menu does not include
   8 any sub-menu either. With this patch, KToolBarButton can use a popup-delay
   9 of -1 so that we can still draw our own popup indicator _AND_ get the sub-menu
  10 in the toolbar-extension menu.
  11
  12 This fixes http://bugs.kde.org/show_bug.cgi?id=77047
  13
  14 Index: widgets/qtoolbar.cpp
  15 ===================================================================
  16 RCS file: /home/kde/qt-copy/src/widgets/qtoolbar.cpp,v
  17 retrieving revision 1.56
  18 diff -u -p -r1.56 qtoolbar.cpp
  19 --- src/widgets/qtoolbar.cpp    21 Dec 2003 00:48:21 -0000      1.56
  20 +++ src/widgets/qtoolbar.cpp    12 Aug 2004 11:42:21 -0000
  21 @@ -648,7 +648,7 @@ void QToolBar::createPopup()
  22                 QString s = b->textLabel();
  23                 if ( s.isEmpty() )
  24                     s = b->text();
  25 -               if ( b->popup() && b->popupDelay() == 0 )
  26 +               if ( b->popup() && b->popupDelay() <= 0 )
  27                     id = d->extensionPopup->insertItem( b->iconSet(), s, b->popup() );
  28                 else
  29                     id = d->extensionPopup->insertItem( b->iconSet(), s, b, SLOT( emulateClick() ) ) ;