From 4cec3bd5701f7863fcfe8dc23aba23049f4b6607 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Mon, 26 Jan 2009 16:57:58 +0100
Subject: [PATCH] Fixes: More toolbar polish Details: Minor shadow tweaks
for bjorn. Added shadow to arrows. Added subtle indentation for combo box.
---
src/plugins/coreplugin/images/extension.png | Bin 345 -> 345 bytes
.../images/splitbutton_horizontal.png | Bin 435 -> 408 bytes
src/plugins/coreplugin/manhattanstyle.cpp | 24 +++++++++++++++---
.../projectexplorer/images/filtericon.png | Bin 494 -> 473 bytes
4 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/plugins/coreplugin/images/extension.png b/src/plugins/coreplugin/images/extension.png
index 6bdfc07b83043b3443064d61e4dc74fe97ea8f95..40c2ee30d6c6e11ba9c50f9c4551663a55b58c39 100644
GIT binary patch
delta 235
zcmV<H02Ke(0@(tPc7KksYJ*S!Mehp|D5P^C1k7T@LYG9ykY8{L2>pt7%TmZ+6t{w1
zIwl|zviJ)|c$45JJP<)QpDs5`(lK|rXSf`$Ac;pA-P!{%x$y$P%l|+KG0OA&eHeys
z0Fx}swp#0705bppNtmX&l2RV}z7IXmdrgw$r|Y^i$r<h+qGTxgsOwr5MX~mM|4k`%
zsj6xZlF(Xjnx?q~LGT&J@pId@e`%T?ZQGuLB$QI8Fbux{jLWjzNhxF3b<Mk77>2O|
l@I(@h<18)9nv(=cTmjq=Ysm}kv5Wu!002ovPDHLkV1mouYKs5>
delta 235
zcmV<H02Ke(0@(tPc7Kl{Yr{|ggzr@Z$_7!PP)ZXf1|cp`TU|yORg*LO3;O}BPKnrD
zU@)epQd3bkq5>iL0f8s;Y{Vlj;oVF+xifbMpSTkw@t-E6Zvotn`5wUR4-i5ul~OwZ
zZ*d$uMNvGF`~a}HLbl^Lk4mYpzVAPSAb6;%>fIP~Cb_`4!DLR7WZ!jN)ilj248v{P
zwuLd~RggqkmK)b~k9A!iwAL5j_rHf>&|2$f0I;Q$KY5<N0GMQ1c9c?{(lni3AI>ey
lx*N-l=XvWWil!t%62GHLXN6c_NKya*002ovPDHLkV1hd^Xx0D#
diff --git a/src/plugins/coreplugin/images/splitbutton_horizontal.png b/src/plugins/coreplugin/images/splitbutton_horizontal.png
index a71fdfdb6244f23a5994f418cacfc39cede918b5..c85a093f2c3250786c13994bef3910d19824d650 100644
GIT binary patch
delta 307
zcmV-30nGlh1DFGlZhsX?L_t(Ijiu8uPK7`a2H<~qh$6T&NC8KHk~??<PT~<vG{(lu
zs4b1$fC~^Hp+L+=8(hZ57#G>sKsjN)`DX&e%-Hi-ySf3`8?{RSp5gs>0B?T_v|7Oj
z@C0Bo0H*-1jwLu5$5Etddb{ong21k->ORY|^R{h2O@LzNLx11*&l}SZQp!8WaU1}@
z!1{;`fDG{&fHh6}cIyNS5m^8(3<!h}+JJw6Wmz^ezijj_0FWffabQ^%702<-*7Ulr
zAHy)z)?NclL}WN3q?8Y?>uL!!tt`uh$aF)1nK_CgbAn+Q_y=`NfamESsRk59!Clvl
zLWtKbV4mlXrYvcc5dgq>o?k1a&b9y|`tp5WYPG$;^EZ=XW%LfB4wL`@002ovPDHLk
FV1f_oiCh2x
delta 334
zcmV-U0kQs=1G58=ZhtUIL_t(Ijir-6O2j}I#ox?^Wy2s_i3za}A;O-*(^y!h%nigF
z><v7@Hfh8r2&pVnBoGu45r)~x{IOYOGf6DmuY7#($NSze#9E6}hMwdG;7w@f0NBj_
zCxDMxK%VE9S(ZI$t-q$+j4?wgy`BYBRh1~EXp$s1u6ey)Uw@QkdGGuF{0W?MyIQSe
z+qN$*AWhQ+A%wX4phT^;C4@{CE2SLmj}k~JEdT=G%w61UHb2=3fZw-w0mc~P_kF)}
z0o(0%dANWA(361ues6^kG>+rji7QxL*LQyclu}@fiLUFOTz43T=^^@{$U!NbbL}oT
zV*o6Ug;9b7U`OdXqbOQVB^UsN5LPMmMk#%C0Yy>xTI*K;>R2bozcC1cD*(Y<e$Vrs
go2Gf61^j2e0Z2e|+NJa92LJ#707*qoM6N<$f=pYPmjD0&
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index ee3ca2f62d1..0b64541ae4a 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -656,8 +656,6 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
int sx = sqsize / 2 - bounds.center().x() - 1;
int sy = sqsize / 2 - bounds.center().y() - 1;
imagePainter.translate(sx + bsx, sy + bsy);
- imagePainter.setPen(option->palette.buttonText().color());
- imagePainter.setBrush(option->palette.buttonText());
if (!(option->state & State_Enabled)) {
imagePainter.translate(1, 1);
@@ -667,8 +665,17 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
imagePainter.translate(-1, -1);
imagePainter.setBrush(option->palette.mid().color());
imagePainter.setPen(option->palette.mid().color());
+ } else {
+ QColor shadow(0, 0, 0, 50);
+ imagePainter.translate(0, 1);
+ imagePainter.setPen(shadow);
+ imagePainter.setBrush(shadow);
+ QColor foreGround(255, 255, 255, 220);
+ imagePainter.drawPolygon(a);
+ imagePainter.translate(0, -1);
+ imagePainter.setPen(foreGround);
+ imagePainter.setBrush(foreGround);
}
-
imagePainter.drawPolygon(a);
imagePainter.end();
pixmap = QPixmap::fromImage(image);
@@ -998,6 +1005,17 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
painter->save();
// Draw tool button
+ QLinearGradient grad(option->rect.topRight(), option->rect.bottomRight());
+ grad.setColorAt(0, Qt::transparent);
+ grad.setColorAt(0.4, QColor(255, 255, 255, 30));
+ grad.setColorAt(1, Qt::transparent);
+ painter->setPen(QPen(grad, 0));
+ painter->drawLine(rect.topRight(), rect.bottomRight());
+ grad.setColorAt(0, Qt::transparent);
+ grad.setColorAt(0.4, QColor(0, 0, 0, 30));
+ grad.setColorAt(1, Qt::transparent);
+ painter->setPen(QPen(grad, 0));
+ painter->drawLine(rect.topRight() - QPoint(1,0), rect.bottomRight() - QPoint(1,0));
drawPrimitive(PE_PanelButtonTool, option, painter, widget);
// Draw arrow
diff --git a/src/plugins/projectexplorer/images/filtericon.png b/src/plugins/projectexplorer/images/filtericon.png
index de7ee4b5f54f0db14e3137c0d9d97283f388a9f1..3fae2defdecc62af31371f25c2e94ff7e509163e 100644
GIT binary patch
delta 372
zcmV-)0gL|b1K9(RZhuxuL_t(IjjfZhOT$1E#$V#mime6|!J)}!CrhE5gMuIqy7>om
zDp>>(!M~<)C~kpnhE7=ow=NFJVlEU4fk4s_x*U?+bEz8jB8B?kgX6pJ`@w@d2@zqH
zkymQ}2Y?jLl`PAimgu|@LXJg%EQ+GNe!p+It{aP*tyXKd+kfqzH5!dC6A?cZ1OYWo
z^8x@iL>i4o=hNww7CYYnwryK+91jtZ6#a!rk|aaRvK~tT?RNWwQaWag-TnkH#;z%)
z<7TsYS_%LFS=aTOD2iM}JS^OGX0w^o>-FvcV67CefNU9tai1i~Ga_yyVr@R3+k?U2
z0RVP><psM!wQXA64}!pR9OuaMyn`?deMM0^qO9;CF~(jw=P;Q}YQFEUbI#>7O<zP=
zA~HWlRaLECuW$a9DFx(to@ttPCCf6VX_}Yiq_W>ANzx?%R0@`fh<s_lvhxlBGc~D%
S_c>nx0000<MNUMnLSTX|aHu%|
delta 394
zcmV;50d@Y_1MUNmZhvb@L_t(IjipmDOT$1Ee%Bl+!8qt7R*ERuMXA(^{scSd(ybkI
zYSC^^f`39PE`^S6P93BmZX%TiiAC$sp(GI6Ea{L?^SKyI+h8sI;NbY~z3;vI?j8d`
zvmi24HW6`ulT0R8YPH(kqy$kE`<(N=F@Z*-q1d*)P^naIHGfSr!;%$6SuGR_DbD#X
z34nfl*zfgv8h}lo8(qa>@!YoUmmnAPz->00Z$xw!?94|xou1F-atGaR_i^YT(18?>
z$4^Ytd;oAdTD@AWUbWlpC&Mu2g8Wbr5ydi@%%$Tv&j3<BUn-T3bY1_f*Xui@!ejR&
zqV00Id_5Qp?tcL+=JWaGR;#6|s(KOTOPD}J5QIa^vR(mfWwY61%d*}92w?(aW&!XR
zV}|E>jEKl}-KZ#vE)ji&J?*5QxRyvHmi`K0VY9#(+wF8ZH<BcIj^jjSS?<fSyfKZy
oIuXSJ)CU0l-vZNM=4t!}4>%w?+Ncm;00000NkvXXt^-0~g6Jo_q5uE@
--
GitLab