diff options
| author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2009-08-31 15:02:16 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-09-02 17:05:32 +0200 |
| commit | 7a5872b5cdbc39ecb72cda6b9092bea175d593cc (patch) | |
| tree | c6de1a28f12f5cdf26ccad52d237d252e3cd3bfe | |
| parent | af50cec55d4da5307134492e48cfcafe93ca8b96 (diff) | |
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)
| -rw-r--r-- | src/plugins/coreplugin/images/inputfield.png | bin | 422 -> 379 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/images/inputfield_disabled.png | bin | 453 -> 379 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/manhattanstyle.cpp | 6 | ||||
| -rw-r--r-- | 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 Binary files differindex 8020c8f731..40bdfc4a04 100644 --- a/src/plugins/coreplugin/images/inputfield.png +++ b/src/plugins/coreplugin/images/inputfield.png diff --git a/src/plugins/coreplugin/images/inputfield_disabled.png b/src/plugins/coreplugin/images/inputfield_disabled.png Binary files differindex c69f082f08..b713a59c8a 100644 --- a/src/plugins/coreplugin/images/inputfield_disabled.png +++ b/src/plugins/coreplugin/images/inputfield_disabled.png diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 30baacf78b..816c6d32d1 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 b558b8770c..67bfa0cc55 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -923,11 +923,6 @@ QList<BuildConfigWidget*> Qt4Project::subConfigWidgets() return subWidgets; } -/// ************************** -/// Qt4ProjectBuildConfigWidget -/// ************************** - - void Qt4Project::collectApplicationProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node) { if (node->projectType() == Internal::ApplicationTemplate |
