summaryrefslogtreecommitdiff
authorsandman <sandman>2002-12-03 00:59:30 (UTC)
committer sandman <sandman>2002-12-03 00:59:30 (UTC)
commit26557b9370b3d1f28224374f8a035ae9051a1317 (patch) (side-by-side diff)
treeb45c67bd4d71910f1faf020e23a01b648d2effbf
parentc3c95ff297355f7024c15134bbc1d15d340bf8fd (diff)
downloadopie-26557b9370b3d1f28224374f8a035ae9051a1317.zip
opie-26557b9370b3d1f28224374f8a035ae9051a1317.tar.gz
opie-26557b9370b3d1f28224374f8a035ae9051a1317.tar.bz2
small fix regarding focus handling on combo-boxes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.cpp5
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
@@ -26,30 +26,32 @@
#include <qtimer.h>
#include <qpixmapcache.h>
#include <qradiobutton.h>
#include <qcombobox.h>
#include <qdrawutil.h>
#include <qwidgetlist.h>
#include <qtoolbutton.h>
#include <qheader.h>
#include <unistd.h>
#include <qmenubar.h>
#include <qprogressbar.h>
#include <qlineedit.h>
+#include <qlistbox.h>
#include <stdio.h>
#include "htmlmasks.h"
#include "embeddata.h"
+
typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *,
QColorGroup &, bool, bool);
QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl);
void TransMenuHandler::stripePixmap(QPixmap &pix, const QColor &color)
{
QImage img(pix.convertToImage());
QImageEffect::fade(img, 0.9, color);
int x, y;
int r, g, b;
for(y=0; y < img.height(); y+=3){
@@ -1399,25 +1401,26 @@ QRect LiquidStyle::buttonRect(int x, int y, int w, int h)
void LiquidStyle::drawComboButton(QPainter *painter, int x, int y, int w, int h,
const QColorGroup &g, bool sunken,
bool edit, bool, const QBrush *)
{
bool isActive = false;
if (( painter->device()->devType() == QInternal::Widget ) &&
(
( qApp-> focusWidget ( ) == painter-> device ( )) ||
(
edit &&
((QWidget *) painter-> device ( ))-> inherits ( "QComboBox" ) &&
- ( qApp-> focusWidget ( ) == ((QComboBox *) painter->device())->lineEdit ( ))
+ ( qApp-> focusWidget ( ) == ((QComboBox *) painter->device())->lineEdit ( ) ||
+ qApp-> focusWidget ( ) == ((QComboBox *) painter->device())->listBox ( ))
)
)
) {
isActive = true;
}
bool isMasked = false;
if(painter->device()->devType() == QInternal::Widget)
isMasked = ((QWidget*)painter->device())->autoMask();
// TODO: Do custom code, don't just call drawRoundButton into a pixmap
QPixmap tmpPix(w, h);
QPainter p(&tmpPix);