summaryrefslogtreecommitdiff
path: root/qt/qte233-for-opie091-menubar.patch
authorsandman <sandman>2002-09-01 17:38:14 (UTC)
committer sandman <sandman>2002-09-01 17:38:14 (UTC)
commit857a4c8df2f933d951075282efbc32955f1a7436 (patch) (side-by-side diff)
treea6be463eab8ffad11c94ebbe93448304569ca89a /qt/qte233-for-opie091-menubar.patch
parent3a99f49a9e2171c2ae20ad21b808f316945726e5 (diff)
downloadopie-857a4c8df2f933d951075282efbc32955f1a7436.zip
opie-857a4c8df2f933d951075282efbc32955f1a7436.tar.gz
opie-857a4c8df2f933d951075282efbc32955f1a7436.tar.bz2
Fix for bug #154:
"Tapping a menu and then tapping another menu doesnt open the newly tapped menu this is a problem with qt, and only a problem because qt is made for mouse input, not tapscreens. try this: open any app with more than 2 menus. open the first menu by tapping it and releasing it. Try to tap the next menu by tapping. wont open, eh? and it should, right?" Does now
Diffstat (limited to 'qt/qte233-for-opie091-menubar.patch') (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qte233-for-opie091-menubar.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/qt/qte233-for-opie091-menubar.patch b/qt/qte233-for-opie091-menubar.patch
new file mode 100644
index 0000000..9e64890
--- a/dev/null
+++ b/qt/qte233-for-opie091-menubar.patch
@@ -0,0 +1,51 @@
+diff -bur3 src.orig/widgets/qmenubar.cpp src/widgets/qmenubar.cpp
+--- src.orig/widgets/qmenubar.cpp Mon Mar 18 02:11:27 2002
++++ src/widgets/qmenubar.cpp Sun Sep 1 19:31:09 2002
+@@ -187,6 +187,7 @@
+ hasmouse = 0;
+ defaultup = 0;
+ toggleclose = 0;
++ openedbymove = 0;
+ if ( parent ) {
+ // filter parent events for resizing
+ parent->installEventFilter( this );
+@@ -906,7 +907,7 @@
+ return;
+ mouseBtDn = TRUE; // mouse button down
+ int item = itemAtPos( e->pos() );
+- if ( item == actItem && popupvisible )
++ if ( item == actItem && popupvisible && !openedbymove )
+ toggleclose = 1;
+ setActiveItem( item, TRUE, FALSE );
+ }
+@@ -932,6 +933,7 @@
+ showMenu = FALSE;
+ setActiveItem( item, showMenu, !hasMouseTracking() );
+ toggleclose = 0;
++ openedbymove = 0;
+ }
+
+
+@@ -951,8 +953,10 @@
+ setActiveItem( item, FALSE, FALSE );
+ return;
+ }
+- if ( item != actItem && item >= 0 && ( popupvisible || mouseBtDn ) )
++ if ( item != actItem && item >= 0 && ( popupvisible || mouseBtDn ) ) {
+ setActiveItem( item, TRUE, FALSE );
++ openedbymove = 1;
++ }
+ }
+
+
+diff -bur3 src.orig/widgets/qmenubar.h src/widgets/qmenubar.h
+--- src.orig/widgets/qmenubar.h Mon Mar 18 02:11:27 2002
++++ src/widgets/qmenubar.h Sun Sep 1 15:54:37 2002
+@@ -139,6 +139,7 @@
+ uint hasmouse : 1;
+ uint defaultup : 1;
+ uint toggleclose : 1;
++ uint openedbymove : 1;
+
+ friend class QPopupMenu;
+