Author: tgoettlicher Date: Wed Feb 16 11:10:48 2011 New Revision: 63429 URL: http://svn.opensuse.org/viewcvs/yast?rev=63429&view=rev Log: fixed bnc #671147 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQContextMenu.cc trunk/qt/src/YQContextMenu.h Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63429&r1=634... ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Wed Feb 16 11:10:48 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=6... ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Feb 16 11:10:48 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 16 11:14:10 CET 2011 - tgoettlicher@suse.de + +- Fixed event handling in context menu (bnc #671147) +- V 2.20.3 + +------------------------------------------------------------------- Fri Feb 11 14:57:41 CET 2011 - tgoettlicher@suse.de - Fixed event handling in tree widget Modified: trunk/qt/src/YQContextMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQContextMenu.cc?rev=63429... ============================================================================== --- trunk/qt/src/YQContextMenu.cc (original) +++ trunk/qt/src/YQContextMenu.cc Wed Feb 16 11:10:48 2011 @@ -52,6 +52,7 @@ YQContextMenu::YQContextMenu() : QObject () , YContextMenu( ) + , _suppressCancelEvent(false ) { yuiWarning() << "YQContextMenu"; @@ -147,14 +148,17 @@ { // dirty hack // see menuEntryActivated() for details - QTimer::singleShot( 100, this, SLOT( slotReturnMenuHidden() ) ); + QTimer::singleShot( 150, this, SLOT( slotReturnMenuHidden() ) ); } void YQContextMenu::slotReturnMenuHidden() { - YQUI::ui()->sendEvent( new YCancelEvent() ); + if ( ! _suppressCancelEvent ) + YQUI::ui()->sendEvent( new YCancelEvent() ); + + _suppressCancelEvent = false; } @@ -181,6 +185,7 @@ /* * the 100 delay is a ugly dirty workaround */ + _suppressCancelEvent = true; QTimer::singleShot( 100, this, SLOT( returnNow() ) ); } else Modified: trunk/qt/src/YQContextMenu.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQContextMenu.h?rev=63429&... ============================================================================== --- trunk/qt/src/YQContextMenu.h (original) +++ trunk/qt/src/YQContextMenu.h Wed Feb 16 11:10:48 2011 @@ -150,6 +150,7 @@ private: QPoint _position; + bool _suppressCancelEvent; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org