| author | sandman <sandman> | 2002-12-08 21:21:18 (UTC) |
|---|---|---|
| committer | sandman <sandman> | 2002-12-08 21:21:18 (UTC) |
| commit | a78a8d830d81adc8c6e9b2131329d72aa0c18b55 (patch) (unidiff) | |
| tree | c3ba3bac0e0b26b5e0009e3ab1a3575d9250dd5a /qt/qte234-for-opie091-popupmenu.patch | |
| parent | 6c0988792eed5cefcc7d1f0c179ccf5317b5baab (diff) | |
| download | opie-a78a8d830d81adc8c6e9b2131329d72aa0c18b55.zip opie-a78a8d830d81adc8c6e9b2131329d72aa0c18b55.tar.gz opie-a78a8d830d81adc8c6e9b2131329d72aa0c18b55.tar.bz2 | |
the patch was reverse - fixed now
Diffstat (limited to 'qt/qte234-for-opie091-popupmenu.patch') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | qt/qte234-for-opie091-popupmenu.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qt/qte234-for-opie091-popupmenu.patch b/qt/qte234-for-opie091-popupmenu.patch index f942ada..025dc98 100644 --- a/qt/qte234-for-opie091-popupmenu.patch +++ b/qt/qte234-for-opie091-popupmenu.patch | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | --- src/kernel/qapplication_qws.cpp2002-12-08 21:51:08.000000000 +0100 | 1 | --- src/kernel/qapplication_qws.cpp.orig2002-12-08 18:06:22.000000000 +0100 |
| 2 | +++ src/kernel/qapplication_qws.cpp.orig2002-12-08 18:06:22.000000000 +0100 | 2 | +++ src/kernel/qapplication_qws.cpp2002-12-08 21:51:08.000000000 +0100 |
| 3 | @@ -3278,7 +3278,7 @@ | 3 | @@ -3278,7 +3278,7 @@ |
| 4 | if ( qApp->inPopupMode() ) { // in popup mode | 4 | if ( qApp->inPopupMode() ) { // in popup mode |
| 5 | QWidget *popup = qApp->activePopupWidget(); | 5 | QWidget *popup = qApp->activePopupWidget(); |
| 6 | if ( popup != this ) { | 6 | if ( popup != this ) { |
| 7 | - if ( testWFlags(WType_Popup) && rect().contains(pos) && !popup->rect().contains(popup-> mapFromGlobal(mapToGlobal(pos))) ) | 7 | - if ( testWFlags(WType_Popup) && rect().contains(pos) ) |
| 8 | + if ( testWFlags(WType_Popup) && rect().contains(pos) ) | 8 | + if ( testWFlags(WType_Popup) && rect().contains(pos) && !popup->rect().contains(popup-> mapFromGlobal(mapToGlobal(pos))) ) |
| 9 | popup = this; | 9 | popup = this; |
| 10 | else // send to last popup | 10 | else // send to last popup |
| 11 | pos = popup->mapFromGlobal( globalPos ); | 11 | pos = popup->mapFromGlobal( globalPos ); |