From 57a8fb919e2cf8aebe7a97d4e5844d1fd94f3760 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Tue, 3 Feb 2004 21:34:59 +0000 Subject: [PATCH] integrated new startmenu side bar logo (posted by Paulo Correasilva) svn path=/trunk/; revision=8017 --- reactos/subsys/system/explorer/res/logov.bmp | Bin 6198 -> 6454 bytes .../subsys/system/explorer/res/logov256.bmp | Bin 6198 -> 6454 bytes .../system/explorer/taskbar/startmenu.cpp | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/subsys/system/explorer/res/logov.bmp b/reactos/subsys/system/explorer/res/logov.bmp index 90228e895f54b3b95794e2a6748ac2c12b6ac324..58e1603c5362bef1adb0b46eccdf720dcdad1942 100644 GIT binary patch literal 6454 zcmZ9Q4|o%0n!w+^N9aEOt+8$B#!KBkR8B5!x|#@c^VHHUNhuMCWV7gky5o9gQL@QU zn>`If7aE%g5rKeFv?Y2Oa8wX<7Q!|*slv0%#)^C$EB-oM{FGvD<4YwoOvO1twafPcZWTX1_7w{O9>agVJQfVvJqg&SV{N1L0Q zgMYem={Ik_2`6y77BBql!A%g|;eo4gtk?N4d=x(hTOYg!4!`(3-0*Ios8eXkLEHm!hNy_?|4M>oK4&b$ie<8Q#nW50p?MG1(e ztHIiS8-#o`?C5<24(wv!wFzt>-J^XFeQqZtPP_=acK#d^zdQvizh4{wK` zKimO3wsgTSwsgbJpWO{(rx@7hwZjvRE{uOI1Uz=w>0S@dZrcRD9y`1c*bGBKC%m}p zF%V8Y3;TCI0?!Aw!2bT9g8zvh!-1zBg?&3W!{KKiN59-~d}s%Ro^ry=`=0>zIR*~z z`wuwrasZAU9)QF9z3{8o_knFqC&W)2f-}dShrj*deK>h!KfLqS5KMd+hxbR1!-wbI zf@9HxF#Y>q!|#553jXxT2Qc=29I_uI;J<};U|JI3lk9o;^TiDODSr_bVtu&ose!Hc z8=>bx0)mfsK`%wZ6aRh}cphrQnC}AD{r?6}I=&CvHk-iTvj$^b4gK!BVcTQf&`+-e zfA4yDs^=bf>Tw$k^xEM-|3k3r$xX2L7Ze

Jg034eY^QxN!b3?Dsv2@p<5&--$6k z2`69iK|XUFUV63{o_m^xg8?_ZeBenqb#xaTk30ph9NY%4zPJMp?eW0d>@Ik1upf>d z+5yL3_QR1EcHsF=U|-k?$6kIK-Z}9cT$0{_w~p)q_C-I8o{GTv#2Xm@Fr0no1dOGV zFeQBm7biY|FaMH*|NZl)@Ym8G!MV|Z^R*6r-T?b|JOI&skHU*jKMXJK*@`x{q1^xs zAKwRWAK8tzegUr^ehQAh)DNd|K8D{s2uc1B&chx!bNnFi+vAqtvfJ{9pviMF~Fr{rfPPO+oJCF?jtY4}AHDci==c0QYZL z1*cxy1Bti8aDv?p{A)PRZy$nFZybc-lZW8b@%Lc-qjT`9<9p!ja1`D?HVB{naRS26 zdf@1g5B5I275;v?2w#0Z4uAjZFEBUzH<*(@g*V^a1^3^-9*IL!&kB8@{a)asRc@q7@_%1RtW3e3V>1o0^ zn#x|0c3q5Dj zxh%^!FiiEW8gZNymJ1|~;W}d31q@TWc{2ixul#v6gZ_wv!k|Ess9(@XuC_WQgD5TQ zhD)x`uCMTAQ(S&fI7bSiM_M5dos`Q;{%3mKJ@FY@$&Zi{IId8Lri-*Eo6Qc%W8}NH z%Vn2@{%Hnh?Pif)84YOE(Wx4b&)3kyX&@SqCq{1mS z$`vO=On68)6PHV6DPGOUVg`A|Hh~!;+a_?%Gu~2Mj?YN0Ic7sfvuvJ5!>JU`| zj}B5Zsq59v+b{R_x-!K)%A)=XPZ7@P3@v8mA=Dt3+e9(LkztldMJgOMM9E@i*gkK) z`WlzWFN@kMoI?G`Q$iMJg_*P8J%>-41+Gq#B-jYb&vQqC_EzriEAc;n4PPKwJNGrG zL~)3z?u{d!k>gh})x$-BRrFucL5O&Ned5w#e&ce_g(jvf7Kvq%bI22`Yi5iYGgd?b7o<~TblP-PRp`@=z-Qwbf z6lXr-hoF>zQh42!C-D+1XC>davdRD|`w!WUj8W#nu9gL1pIF1NM$SGR7 zs-aeotybG8kK?^h*+X`l0c{YWFq`Iwn^anT)zSiWZLPj;r8FpD=IjZ>D3K%#sln!! zI(^-O;Y`JTgSIyADTdjQ-C{5(9!&Gn4f?tkn$Gl82Hd8ti@TPkjP`ESpR^N2*UDOa z;HL}WNvysZxzwOdBGF(-ls;ZqRmQ@&<$78lr4=&Qn%Zd2?LIPVvZf za@rHshBG;%!VSoU#kDu}=Eya6s#uX1+YBh54jFvbq#tk4inwhRmcOQA(nG5uG2Sob(xZq-|uQ`o3llV z2-ti!OR_%{B8Z}UxK68T+UlJ+U8U036=MRXYzFKM+WQ_C{$Y*|xPRaH;Rva5)(gou8WM;lhFo!|rw-6O@X)ZdB@agd83 zUxg!lwj>+&cv^(|RJ&_J@xQjIQAZaEw!#w_V>FjtfYqg~U7$RDWEECe$wMMX4-@J{ zV!3C5R#la+S7{e0)gj9b`ljA-g(p@edv2`-odn7UEQ-91 zrL_$@Q6%Y>T9u-|eWgh?Ycn8M^jjXT>_b z>ZVD}cuRGw_NHsK`f42)uwwQs1IYab11GRI-G)oP__n4RRju~2&Q18x`=G)tm|?=6 z7o{A@&EH^gDMlE4wtj_oD;5GFoBhrlOXPELFJ?$wUQlE0DDoo~b+^xg=LrjuG~^2x zdP+S#WXP_@d0Ax(21mO4EPbfKm*`7cLVUO*v&D14Zn3Eo{W!uO?5gOmaIB>~)#2`q zbsCge@!5O{uHWC`uY<-%c`I` zpzs0If!Y+_HqX&IYFyaGz}pSi!w zZ$_?8^jVOPZ$plClNbq@2h3fj0dv3EZ(cPoKTYH_+ca0WU*YBvv(M}|`9>@Qi4hA& z6pGt4G1gLvuEP7wYO~MetIU%nMHKSeG#)l##pwG@1Ewy8B3C2Fe6xfTInCOVYD<^T z+=tw6Qk(irYIDDmGs59?#(51JGN=omHLQ{9w{`WS zW~15X516}6LA9-W)M_9ch2^tCo}~y|s1Gd!LuQ{k)Q8y&j3(_AYiA45IO)VyN63iz z2qlbWOW$ZBWTO&BwNF=C;1K;qt0#6Br{J8==$JHX4yBZ)sd3WSKAY`F%ZQ`IJ#t7P@%j+nSCI&}D1F-<^^qGR5eL5O9g~_x z)A3TVn4Vo4Oc)cX2=~?2p0VO}cU-&F7D?vuQ)Eoa7Rbz{HYZ^-p!M{3ZN&I^hpsaj z&^NTUnvDfcSx*a@rAzSr&Nbe&Vuef8jX4He(x%p?zE*QTn>4bsJqd&B{r{Y=Iz%Xi7+N z0?8%1^xJFnrmaie!&h&`e>X^)kEfNzA4%q;;f}%@joZ|!(zX_wM~fYnty!rgju)sU z_Gr2w`kZ9pTyux5wYIg()+@h9$LfbsK__+2;KZ-{;>U5q5@^e{Zr8TfPt!BAxn;AL z;~r0Qc&U-Z|1ad6cj~m;TU%RIHQP6)M0`4?1<7{C)7fcB<)Y~*&nIYAjefhHsWsU+ zsRajQdd9k4?m_gf;O24yxp8}C)l{SR;VKuo?8N;WrOSpn=q~oR?6w9-M_4JNut-fywnOmu`XG-mw@7@?nG?LSyu?8a* zjS5Y(obwL7-rt>S7K_paw|&}gGIvvyU1vg0@Ijq;r!%Q-?IJX^XQge8Zlh_{fX#23 zr5Y`^CHNIv(%A_OsUPw1F5M2XBV-&2;`7BpQ*wiqz;Cyn_{Ic2H#YW%)1w_?VmdkE z_fd_khIS@x_J||6vSp)<3WcK`*7`VS=(xqym7pjxpOe(L`3=-7*VUCLL~-%yYb}M& zrbgRF^D2rUi=30lhL@N_)|Vs4)S+>~U-&FI$iCd;fa>YmOtYefZk@uReB!Jn~RtYun?mKlI4Ie&?Sr`Uh4ApV@5;MP7dC zflpcP$oYqUd!9QQi5zkBcfHklbwj`xShsh#)%v3!JxH8=@PP*&dgv#_`J?BLzOgBJ zV0~bnKRDpqYqeU}8w>|4?ZLCyaMUY@?@jIr?phmM71+DaxPJ5phJ!!A_QU&>{e3v< zzWesC4;aF2zR3)qtRxwtX;QjbuhSk-7}WN`cNp8+`BjN%h($ literal 6198 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 literal 6198 zcmeH{ze{CD6vxkkg@TO`B!$JsD%JxFw)Vm{)^_tR*ra%sbs!*2Czu3MY~x?>sub(g z+N_nuf&{X5LW;@foIAhn^*y)9n%&}EojWtk@XhyP&zm)oA6dO-oHJg@ zI&YruhUw{hCc>}GX2ZmrrOfAZnSYqer}w|h+S;0|udmDI=B8|IZOQibw(RWe$nNg0 z?CtHz(b16{9v;fU!GY}W@5}6`ByZm)`9-cJ{T1cU>%Zmt<45`Vk9Q<;49^IRIBXp@ zhs|MgYD>j(vuEzrQfIYAY*aLPZiP$6dh&^J6*c1E2K1Ivycsuet0yz#j zNn+`FIT#!a4h9E{>D`p5&fHo}eBUYXhQZ;bHNxSXU?4ODI}8bi1VaKKkv|eFaWLWJiQ(CMIFiLyA1^=1Z*qKmEGH)?a(a3y zXJ=<}b#*0|mzQ#Lb0fF6w{mxPC-?XF^6>B=kB^V?>7OLOo}cq~Jfpk%H=q;oY^QN` zn`GnpCp|B3tn}v_wCc|{(VvSaPrjHuJ&`Y_dUec;T-MZlQ4YSCK29*nZ*}y9Wj$~q zCmroh%Ca;-_q|8a&00=&4oz<{`v{A5Qeo>NzXm(gqZQGbHVTb)l&dZC_?g6FqMi_orEx->;_OsjhweYJ4HRWo?=I{GY9VU?06l=SRx0 z>GhViITk(NOPPwf_P+>aE)HeZh%G)|Sy-$$*DtBJs@kfL->hxb>(koQtLa76xmoL~ zncJ#6KRVQH%K1KK-^r|ZCzPsft6l=B+y(e%^sZ+M_}d3D#;^Tv6(_=hd3`xuQ|D-H)%cC9Ih4F*wzKtIU6k|L&}GO6YerktbJcOI z*K7L!^`Z1>9i_erSjFq~8h{w3kNx+NFILqi*YlHWuiM<8x}Ppq`m`hC{i;9XeoS|( R{!BYE-mm&I?#FbO{srG_#})tp diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp index d3f4ec19aef..867c49d5498 100644 --- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp +++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp @@ -1272,7 +1272,7 @@ StartMenuRoot::StartMenuRoot(HWND hwnd) _logo_size.cx = bmp_hdr.bmWidth; _logo_size.cy = bmp_hdr.bmHeight; - _border_left = _logo_size.cx; + _border_left = _logo_size.cx + 1; } @@ -1483,11 +1483,11 @@ void StartMenuRoot::Paint(PaintCanvas& canvas) int h = min(_logo_size.cy, clnt.bottom); RECT rect = {0, 0, _logo_size.cx-1, clnt.bottom-h}; - HBRUSH hbr = CreateSolidBrush(logo256? RGB(166,202,240): RGB(255,255,255)); // same color as the background color in the logo bitmap + HBRUSH hbr = CreateSolidBrush(logo256? RGB(166,202,240): RGB(71,103,121)); //RGB(255,255,255)); // same color as the background color in the logo bitmap FillRect(canvas, &rect, hbr); DeleteObject(hbr); - //PatBlt(canvas, _logo_size.cx-1, 0, 1, clnt.bottom-h, WHITENESS); - PatBlt(canvas, _logo_size.cx-1, 0, 1, clnt.bottom-h, WHITENESS); + + PatBlt(canvas, _logo_size.cx, 0, 1, clnt.bottom, WHITENESS); BitBlt(canvas, 0, clnt.bottom-h, _logo_size.cx, h, mem_dc, 0, 0, SRCCOPY);