From 4cec3bd5701f7863fcfe8dc23aba23049f4b6607 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig 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 zcmcb~bdza9S$*HetmXg)*Z15)8cT{5S delta 235 zcmcb~bdza9S$)4^_Td1AmiM77r`Q4)26zdpu_@{WM8~>GhE6vA&HbBktzYMjm;{4m z%YuRf%@;8#{$y-a|D1C~S?}RpAFG|l2HH&g!?0n8)3(PJ{a!2A?|X0GtWdFH)vLP_#cDeb>^PX>H!0?`N(XPA)^SvDnT-X)W{ taq{PMPw$dG-TS=qwMN%66-S}{i@nlYBjP=R7#J8BJYD@<);T3K0RTHNXx0D# 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 zcmdnYJcD^cUcIQNi(`mI@6yYLeyt7yY!B)yI+S*pcrdy*OtP+E_Io7gV{+`+=@q)Y zcN(|_6c#$1ag&ZYc1%M2=5+_l#C<>0nU0*f@i}7mF2)j|VQvtlIsKr|H1DRj=$$Z~D9~*WR}w>6vr={qN_cFY^bTvOZoY z!?6FruMVCDo{y3ZroO+*UbAouMl$H}aI^^AYN&5WjWjdfpYuhJVS>uZ!h}dM(c>S_ zUi-3Zo%~^gE7#(feOyv3l$K24U-vqT(`2pA>DCh^&J8myyOfHX5+#1Hm-;k3e<{C` zO~mzJ?Dbx!j_bM!^PcxF)5)A7$Z()?UcC0wbK4k{etoKq&)T|o|7Y{bNvU7>7V%AC QU|?YIboFyt=akR{01xVkTmS$7 delta 334 zcmbQiyqS4IUcG^*i(`mI@6yTkUPl}xj^01hmU>trx|4Gwzv7{Jhb~7%EIY${MEVV{ z%|WxwBWfHgb%Ip{L<9xfZl3(JF*4QIQ|He5nws~=f8R4W64f2tHtz}B1K*723^&gF zQ*Y>xbeQ*idgL_QjJ5lh-RUuO*4#UfH6(PZ#?p*QD(34d_r}H7Pf4wO|NGw`&N;=q zqt>R}-lngo;Cq=>v1P}v1ukp1sKL~e=+0jw`G+(8kjCjZunc5-zs3z_xN_Fc0}y;@_MEzK?yyb>t4@`DVJz_srYNb z2}jL2#c%a2k{NXRS_7My6Wm`~E!K$gQZVy+!sr_KBkFZH!>b7OmdKI;Vst08Cq%mjD0& 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 zcmaFIe3N-XUVWISi(`mI@7l>5y$?Hx9E*Q+v1=`x$iamt)6~5e&Tei};M?_+y+kXL zMeyMMWrZ4fjd^W;ku2Nw_)aG2iEuSKToTwNGwDw8N~y0(t-l^LKi>WR_rYdsPQk>f z6T`Fqvp0yGo2qkq-n18c1fBX^8+5uB?XBCNzjK{*_pG&H+1qc|zny0))vGToXfMjb zXzKf!iNVZ8s@LuL<(E^$tnV{y%Z)CS;TN1J^0(Dvl8W=`O>*9hZ_9qS1X-o^-2KO5 zaBQ9C(#L6=E2Fp=7$UEKovqOo<6@(8r!;Nz%*(I8zGFyOE3%;>N3yMOzRF2sr99=N zT)X+Vn-4xALbt*FP5P7njz`mSkPb z^J}Vi($Z_~%kz_6qL8OFm95kD^@W8h0=INtP6+tCQ^MzVg6`i34}QGc`+o25cXG@Q zn-z?L%>)bUC;O;{XKlT8cL__N$nQCy_Zl|3EnawI+unecA$g|tzQ%_qiMmGWig0P3 z`>D^_P*-!~{nsj~2H*M8u}70W-r4qcx`OzZ1G#3i^Ib~B-kfo_nmh0O(<1h}dEX0P zC|qb1=|Ar8bGe40z$$8Q)Y`bMx8JHCHh9+bCqO{(sL{+bOCMXDX9%*3*P7Z_68nG6 z_1D&m4<&zBS@gDOXN|1{&%1g?ooAnaJ`G#Fbk(XV!Drqx99#rioKJ6xW6Vk2d^7p< zrhAMWiA>39j2|SD+n!hUbet%?yF#N&Pq4Pt_U)4SJEnQ4O#8=`khuAP#O=2wR_2pb zD*GP0q(;6wy=jkO?*S{pqfA%W8UEg9x}5MV^A8)pg@V