From 57bebee6402ad7b9b434df6b9fca04ffd2780e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Mon, 31 Aug 2009 15:02:16 +0200
Subject: [PATCH] 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
---
src/plugins/coreplugin/images/inputfield.png | Bin 422 -> 379 bytes
.../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 8020c8f7319c5194b56b9e9b3d94816f7fae536c..40bdfc4a048fcde317a295c3ea224865bd034f73 100644
GIT binary patch
delta 313
zcmV-90mlBO1N#DyF%Je}OGiWi{{a60|De66laVeSf7u8h3>yGp!`ZO_008?*L_t(&
z-tF2kN&`U@fZ=bF^#DOkW#?rq#0#Xh%RMY??Yx1tpx|}1Pzb?7C2?gfc2>fiU<Td~
z!?Lg3k7;H$;Rsi_z*5vo?|8sn!Ww6I#2fbLF~oPOwuBR0;w9l3*BS5|y9304tP?Py
z%aAu6e-_wez|R6Psu!}$PKz!N_Ze>&JF%Ia_&W_I#Qty%!|)T|s&dJcU=Fi98;TXx
z-@nzY7z)Iu5S55gqXl9hMu8XwVibsh7}bfGif2@JsYFc0irPR-jAy4?<4wj_e(&?S
zTpYpGjW@?Jw$r8XDemzquA*9jTw;ZfWc)p2AC2=Y8@15}Pq_U9vcy1zU2t6|00000
LNkvXXu0mjfvow%m
delta 358
zcmV-s0h#{$0;U6yF_A+Xf7k{T5DpCKk;7jA00B5jL_t(&-tC$(YJ^Y_hCg-oiEg<p
z20X^r9>Bs@BvoK9u^|vhnw%oA&8D=l_Bw%}EM8#crAQR_22Yp|h6hvrAJfb{?{GL6
z;1zfRQk1pu4V-~@0p7AKJLP#!k|Y>o5D`4j)0iB^T1(&eY11?>e{I_a0vwB?AW0IU
zC?X8QS)z(`Q=qk$IF6~RineW!0_=CY9Z?jq-EQwBD(;HB-EN2oz+M21F@#|_mrkPl
zlNbcS+!Fv1xvR})qiL;xaU22gfqCk5`qsnJmA`B*U&Vci6TZf=epI4LR8*p(5*3xG
z5)}s}T5IoK#ch_JT>PoAEM*-MCszXW!!YdQI9_hXbp_|Rym1`4UatVX0H1YTpUSc%
zP5%!2dWv#iWY=|EE*F5a_y0ZP19$`;G@{k;1AGC`zqdkcNSe!;q5uE@07*qoM6N<$
Ef{`Pk1poj5
diff --git a/src/plugins/coreplugin/images/inputfield_disabled.png b/src/plugins/coreplugin/images/inputfield_disabled.png
index c69f082f087f96a9fac5ed90504ebc7e8c21be37..b713a59c8a056058411f1f7b383340a906b4d41e 100644
GIT binary patch
delta 294
zcmV+>0one=1N#DyUVqsL9}F8K!=$Lg0002{Nkl<ZXx{DFF-inM5Juszmq}$6FJR;)
z3=9O%V6?I4(m*dEV&*YS1$Es_-I-m3sWBKZ?}mENG*oB(_`9L1pu-g|a4czscRb*}
zV1-jW;{!d0yrb$l#2H=+ZgCd^zwv_|_OX(>D6tkH^18zkpMN3n3)@Iz3andX7r|S0
zQS2ju+t`OpV)aSfO@&F~5XI>~?DMXgpcn7z#6Hv46o0Pf5~akZB$`W18YLyB#3Usq
zDKSZjDKV*2Vwvqp-IV_%mXz3(#KPD+-Qd7D!RU;=(@wVFYL~Y#PM|i^Q1}Foc$1^3
sRzx1*60g%-Y9EF3I7r%HjVIjv0t4MVOgO>kwg3PC07*qoM6N<$f{qP~VE_OC
delta 368
zcmV-$0gwLs0>uN6UVqpI8x9vb^YCHv0003+Nkl<ZXx{CbJ8A<l6h)7$r}?-XGPXA{
ztruW$IhcUgU;-gc7LqQz2zHTT!0oIiF#hx&tQ5%@dj}G{1LA?od$=GZnX0NB@CrNw
zQ<PZv0d~Nr0B`g8e6v_AD9aM(93r9-1<v7cnC|!cm$q$30)MQR%Oz!5l4TibnqsZR
z7=tlJ(+UjlJ>GlrJZH69(YEbcfTAc0vMggf9+M;qBBBBV7uokclgR|25CG>KX_}HG
zi8e8kCR%H6djcRLSZi<7Ij3nwz;JdM4I4xAw0&`K@9II~{Zzu2I55&U;zuQ_L`5Yk
zDp661Dp3hgqG|X3VJcyB@99C}u#`9?4z2_^p3mnZ&vW{|M?|<>E_wwQxV-E2%IS0h
zI12F9G|i^2Yi6_ApILp13SMN_b!@j=fSvjOp79RUz>`K44IS_eeEb4x2W8}^a~0eG
O0000<MNUMnLSTYUd88)*
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 eafa7eda80d..857515b5f32 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
--
GitLab