Revision: 6423
Author: nogu.dev
Date: Sun Jun 6 05:54:01 2010
Log: * qt4/toolbar/common-uimstateindicator.cpp
- (QHelperToolbarButton::mousePressEvent):
Call QToolButton::mousePressEvent() when menu() returns 0.
This enables a button without a menu to work properly.
http://code.google.com/p/uim/source/detail?r=6423
Modified:
/trunk/qt4/toolbar/common-uimstateindicator.cpp
=======================================
--- /trunk/qt4/toolbar/common-uimstateindicator.cpp Sun Apr 4 20:35:54 2010
+++ /trunk/qt4/toolbar/common-uimstateindicator.cpp Sun Jun 6 05:54:01 2010
@@ -287,11 +287,13 @@
void QHelperToolbarButton::mousePressEvent( QMouseEvent *event )
{
#ifdef PLASMA_APPLET_UIM
- if ( event->button() == Qt::LeftButton )
- emit menuRequested( menu() );
-#else
- QToolButton::mousePressEvent( event );
+ QMenu *popupMenu = menu();
+ if ( event->button() == Qt::LeftButton && popupMenu ) {
+ emit menuRequested( popupMenu );
+ return;
+ }
#endif
+ QToolButton::mousePressEvent( event );
}
/**/
