| author | harlekin <harlekin> | 2002-09-09 15:41:53 (UTC) |
|---|---|---|
| committer | harlekin <harlekin> | 2002-09-09 15:41:53 (UTC) |
| commit | 59844388cf877a0abe66582822c90712979fd9c3 (patch) (side-by-side diff) | |
| tree | fcbcc00e0f6f941cc81f1c0ab6b4dd8dbfaaeaa3 /qt/qte234-for-opie091-menubar.patch | |
| parent | d216f8562ba0ccc630e1c5499c51565cab066322 (diff) | |
| download | opie-59844388cf877a0abe66582822c90712979fd9c3.zip opie-59844388cf877a0abe66582822c90712979fd9c3.tar.gz opie-59844388cf877a0abe66582822c90712979fd9c3.tar.bz2 | |
first round of patches to qt embedded 2.3.4
Diffstat (limited to 'qt/qte234-for-opie091-menubar.patch') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | qt/qte234-for-opie091-menubar.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/qt/qte234-for-opie091-menubar.patch b/qt/qte234-for-opie091-menubar.patch new file mode 100644 index 0000000..9e64890 --- a/dev/null +++ b/qt/qte234-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; + |