author | sandman <sandman> | 2002-12-03 00:59:30 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-03 00:59:30 (UTC) |
commit | 26557b9370b3d1f28224374f8a035ae9051a1317 (patch) (unidiff) | |
tree | b45c67bd4d71910f1faf020e23a01b648d2effbf /noncore/styles | |
parent | c3c95ff297355f7024c15134bbc1d15d340bf8fd (diff) | |
download | opie-26557b9370b3d1f28224374f8a035ae9051a1317.zip opie-26557b9370b3d1f28224374f8a035ae9051a1317.tar.gz opie-26557b9370b3d1f28224374f8a035ae9051a1317.tar.bz2 |
small fix regarding focus handling on combo-boxes
-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index e6d8310..4a65952 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp | |||
@@ -34,14 +34,16 @@ | |||
34 | #include <unistd.h> | 34 | #include <unistd.h> |
35 | #include <qmenubar.h> | 35 | #include <qmenubar.h> |
36 | #include <qprogressbar.h> | 36 | #include <qprogressbar.h> |
37 | #include <qlineedit.h> | 37 | #include <qlineedit.h> |
38 | #include <qlistbox.h> | ||
38 | 39 | ||
39 | #include <stdio.h> | 40 | #include <stdio.h> |
40 | 41 | ||
41 | #include "htmlmasks.h" | 42 | #include "htmlmasks.h" |
42 | #include "embeddata.h" | 43 | #include "embeddata.h" |
43 | 44 | ||
45 | |||
44 | typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *, | 46 | typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *, |
45 | QColorGroup &, bool, bool); | 47 | QColorGroup &, bool, bool); |
46 | 48 | ||
47 | QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl); | 49 | QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl); |
@@ -1407,9 +1409,10 @@ void LiquidStyle::drawComboButton(QPainter *painter, int x, int y, int w, int h, | |||
1407 | ( qApp-> focusWidget ( ) == painter-> device ( )) || | 1409 | ( qApp-> focusWidget ( ) == painter-> device ( )) || |
1408 | ( | 1410 | ( |
1409 | edit && | 1411 | edit && |
1410 | ((QWidget *) painter-> device ( ))-> inherits ( "QComboBox" ) && | 1412 | ((QWidget *) painter-> device ( ))-> inherits ( "QComboBox" ) && |
1411 | ( qApp-> focusWidget ( ) == ((QComboBox *) painter->device())->lineEdit ( )) | 1413 | ( qApp-> focusWidget ( ) == ((QComboBox *) painter->device())->lineEdit ( ) || |
1414 | qApp-> focusWidget ( ) == ((QComboBox *) painter->device())->listBox ( )) | ||
1412 | ) | 1415 | ) |
1413 | ) | 1416 | ) |
1414 | ) { | 1417 | ) { |
1415 | isActive = true; | 1418 | isActive = true; |