From 7a5872b5cdbc39ecb72cda6b9092bea175d593cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Mon, 31 Aug 2009 15:02:16 +0200 Subject: Use the theme background color for panel line edits Previously, the image used as background forced it to be white, which made the text impossible to read when the palette foreground color happened to be white as well. Task-number: 258167 (cherry picked from commit 57bebee6402ad7b9b434df6b9fca04ffd2780e78) --- src/plugins/coreplugin/images/inputfield.png | Bin 422 -> 379 bytes src/plugins/coreplugin/images/inputfield_disabled.png | Bin 453 -> 379 bytes src/plugins/coreplugin/manhattanstyle.cpp | 6 ++++++ src/plugins/qt4projectmanager/qt4project.cpp | 5 ----- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/images/inputfield.png b/src/plugins/coreplugin/images/inputfield.png index 8020c8f7319..40bdfc4a048 100644 Binary files a/src/plugins/coreplugin/images/inputfield.png and b/src/plugins/coreplugin/images/inputfield.png differ diff --git a/src/plugins/coreplugin/images/inputfield_disabled.png b/src/plugins/coreplugin/images/inputfield_disabled.png index c69f082f087..b713a59c8a0 100644 Binary files a/src/plugins/coreplugin/images/inputfield_disabled.png and b/src/plugins/coreplugin/images/inputfield_disabled.png differ diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 30baacf78be..816c6d32d1c 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -474,6 +474,12 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption case PE_PanelLineEdit: { painter->save(); + + // Fill the line edit background + QRect filledRect = option->rect.adjusted(1, 1, -1, -1); + painter->setBrushOrigin(filledRect.topLeft()); + painter->fillRect(filledRect, option->palette.base()); + if (option->state & State_Enabled) drawCornerImage(d->lineeditImage, painter, option->rect, 2, 2, 2, 2); else diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index b558b8770cb..67bfa0cc559 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -923,11 +923,6 @@ QList Qt4Project::subConfigWidgets() return subWidgets; } -/// ************************** -/// Qt4ProjectBuildConfigWidget -/// ************************** - - void Qt4Project::collectApplicationProFiles(QList &list, Qt4ProFileNode *node) { if (node->projectType() == Internal::ApplicationTemplate -- cgit v1.2.3