summaryrefslogtreecommitdiff
path: root/qt
authorharlekin <harlekin>2002-09-09 15:41:53 (UTC)
committer harlekin <harlekin>2002-09-09 15:41:53 (UTC)
commit59844388cf877a0abe66582822c90712979fd9c3 (patch) (unidiff)
treefcbcc00e0f6f941cc81f1c0ab6b4dd8dbfaaeaa3 /qt
parentd216f8562ba0ccc630e1c5499c51565cab066322 (diff)
downloadopie-59844388cf877a0abe66582822c90712979fd9c3.zip
opie-59844388cf877a0abe66582822c90712979fd9c3.tar.gz
opie-59844388cf877a0abe66582822c90712979fd9c3.tar.bz2
first round of patches to qt embedded 2.3.4
Diffstat (limited to 'qt') (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qte234-for-opie091-menubar.patch51
-rw-r--r--qt/qte234-for-opie091-style.patch11
-rw-r--r--qt/qte234-for-opie091-unpolish.patch23
3 files changed, 85 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 @@
1diff -bur3 src.orig/widgets/qmenubar.cpp src/widgets/qmenubar.cpp
2 --- src.orig/widgets/qmenubar.cppMon Mar 18 02:11:27 2002
3 +++ src/widgets/qmenubar.cppSun Sep 1 19:31:09 2002
4@@ -187,6 +187,7 @@
5 hasmouse = 0;
6 defaultup = 0;
7 toggleclose = 0;
8+ openedbymove = 0;
9 if ( parent ) {
10 // filter parent events for resizing
11 parent->installEventFilter( this );
12@@ -906,7 +907,7 @@
13 return;
14 mouseBtDn = TRUE; // mouse button down
15 int item = itemAtPos( e->pos() );
16- if ( item == actItem && popupvisible )
17+ if ( item == actItem && popupvisible && !openedbymove )
18 toggleclose = 1;
19 setActiveItem( item, TRUE, FALSE );
20 }
21@@ -932,6 +933,7 @@
22 showMenu = FALSE;
23 setActiveItem( item, showMenu, !hasMouseTracking() );
24 toggleclose = 0;
25+ openedbymove = 0;
26 }
27
28
29@@ -951,8 +953,10 @@
30 setActiveItem( item, FALSE, FALSE );
31 return;
32 }
33- if ( item != actItem && item >= 0 && ( popupvisible || mouseBtDn ) )
34+ if ( item != actItem && item >= 0 && ( popupvisible || mouseBtDn ) ) {
35 setActiveItem( item, TRUE, FALSE );
36 +openedbymove = 1;
37+ }
38 }
39
40
41diff -bur3 src.orig/widgets/qmenubar.h src/widgets/qmenubar.h
42 --- src.orig/widgets/qmenubar.hMon Mar 18 02:11:27 2002
43 +++ src/widgets/qmenubar.hSun Sep 1 15:54:37 2002
44@@ -139,6 +139,7 @@
45 uinthasmouse : 1;
46 uint defaultup : 1;
47 uint toggleclose : 1;
48 + uint openedbymove : 1;
49
50 friend class QPopupMenu;
51
diff --git a/qt/qte234-for-opie091-style.patch b/qt/qte234-for-opie091-style.patch
new file mode 100644
index 0000000..1944da8
--- a/dev/null
+++ b/qt/qte234-for-opie091-style.patch
@@ -0,0 +1,11 @@
1 --- src.orig/widgets/qcommonstyle.cppMon Mar 18 02:11:26 2002
2 +++ src/widgets/qcommonstyle.cppFri Aug 30 04:28:27 2002
3@@ -562,7 +562,7 @@
4 bool enabled, bool active )
5 {
6 #ifndef QT_NO_MENUBAR
7-#ifndef QT_NO_STYLE_SGI
8+#if 1 // #ifndef QT_NO_STYLE_SGI
9 if (draw_menu_bar_impl != 0) {
10 QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
11 (this->*impl)(p, x, y, w, h, mi, g, enabled, active);
diff --git a/qt/qte234-for-opie091-unpolish.patch b/qt/qte234-for-opie091-unpolish.patch
new file mode 100644
index 0000000..ba9e9b3
--- a/dev/null
+++ b/qt/qte234-for-opie091-unpolish.patch
@@ -0,0 +1,23 @@
1 --- src.orig/kernel/qapplication.cppMon Mar 18 02:11:25 2002
2 +++ src/kernel/qapplication.cppFri Aug 30 04:28:34 2002
3@@ -930,10 +930,10 @@
4 void QApplication::setStyle( QStyle *style )
5 {
6 QStyle* old = app_style;
7- app_style = style;
8
9 if ( startingUp() ) {
10 delete old;
11 +app_style = style;
12 return;
13 }
14
15@@ -954,6 +954,8 @@
16 old->unPolish( qApp );
17 }
18
19+ app_style = style;
20+
21 // take care of possible palette requirements of certain gui
22 // styles. Do it before polishing the application since the style
23 // might call QApplication::setStyle() itself