From 2aa5134d87d71d028cee0e71fb844752ee0b30cf Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 10 Aug 2015 21:15:43 +0000 Subject: [PATCH] RichEdit: UHD ruler fix git-svn-id: svn://ultimatepp.org/upp/trunk@8809 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/RichEdit/Ruler.cpp | 12 ++++++++---- uppsrc/ide/icon.ico | Bin 2862 -> 2862 bytes 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/uppsrc/RichEdit/Ruler.cpp b/uppsrc/RichEdit/Ruler.cpp index 93eb5fc68..861c95e71 100644 --- a/uppsrc/RichEdit/Ruler.cpp +++ b/uppsrc/RichEdit/Ruler.cpp @@ -43,16 +43,20 @@ void RichRuler::Paint(Draw& w) w.DrawRect(x0 + x, Zy(3) + h, Zx(1), h, SColorHighlight); } i = 0; + int xs = 0; for(;;) if(++i % numbers == 0) { int x = fround(i * grid) * zoom; if(x >= cx) break; String n = Format("%d", (int)(i * numbermul + 0.5)); - Size tsz = GetTextSize(n, Arial(Zy(10))); - if(x + tsz.cx - tsz.cx / 2 < cx) { - int px = x0 + x - tsz.cx / 2; + Size tsz = GetTextSize(n, ArialZ(9)); + int px = x0 + x - tsz.cx / 2; + if(px >= xs && x + tsz.cx - tsz.cx / 2 < cx) { w.DrawRect(px, Zy(4), tsz.cx, sz.cy - Zy(8), SColorPaper); - w.DrawText(x0 + x - tsz.cx / 2, Zy(4), n, Arial(Zy(10)), SColorText); + + w.DrawText(px, Zy(4) + (sz.cy - Zy(8) - tsz.cy) / 2, + n, ArialZ(9), SColorText); + xs = px + tsz.cx + Zx(4); } } FieldFrame().FramePaint(w, RectC(x0 - Zx(1), Zy(3), cx + Zx(3), sz.cy - Zy(6))); diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico index ed674dab4681e8f6a8a54a9f03063eb6fa681734..57ead80fbb3aff6dd916df2cf42ba1430ef7f781 100644 GIT binary patch literal 2862 zcmcguJ#Q2-5S{xzMT!(kDi949$;H}UuXnqgbWxNd4NB@1NQhqm?MW2SAqWY%hTn1p z4Lv^xX?f4y-MiaMqLYZQG&lBmKHfZgtrO`;PYw}mO6JUKGX|7@UL}~ZOvBiRT?Ucrq7LjS7<`cdXE}WlzQA753kS%95;Npu7lfq zP5u~(48ixo_$ptGE9%H#6Mu)#8U*5O7_0KM*4V#?f9AP6o=3>M?01LwkfidDJTNxK zbFblM9eJErm?KxLN8eSBl|5kDj&EDG^0gfvW6jR~JQG>=Rx-yM(w6mo&Kbkl&39%T zARQsTJ;vR>eE#rJ#${iA|NJH6ZYd)qC}A&QBjwsUF^LXZyF#>1AgSm)7voZh5nUuw zq)NO~qP-Ghpdr>O$zV&h5~m7Lh*QRj%DiN-6}gf`8Q5TlO=pSh@14r@dJ>5(w*Hu6-p~>l`-V2{z_pok9-x z_vCDPBA2tNOed_xJ?1FHSoDjzW=+JhKU<&=_Q?7Q`Or7}(!iKOQixTkn*kGjplN3h z^ednpw1qYhd$=#BXHz-8oXPogf_QQVF32A^*F_;d0ng+XeX>p-a*z||VeML2JJ!gd zQ^hlI;()<`r-WPqQ;Z|t=&M^8JkFCi>Bm}Dfh&)E$ip5SYzCV64LBedwmN&BKYdb# z9x@wnyVgA^D*g=f0$=+K$d~fGZw|bp2JW4)UJUPq$GN0Do9eFO9%+~19)efkAU2+X z(l{H~v`0MdleURC^cBv`yUNRIwDdq*9Ypg(?Zzz!Y0LGX~Gro&z1x0aAM%^s_7q5#k2 z2R4&9vEY}rd4A*~ga3|W*u&dWjb5iC!(mUL!Wa(*G8ztLu=c!+M#ILvhuH3DB-9vC zSa&zqgKoFp4{?J*w~iO)??dYRVclO_kH^yM_hr0-h+I4Vr+VCXHWpnr&{vaP-r1G+ z_H3~|ZY*tAPi|g+dAeBKUVMLZ4ZT==f5%^IzrMeM2lUIRuU}9v7T2%%dwcQig8tCQ TL4UfM-4@)rO8MIw|H{)}2tr>s literal 2862 zcmcguy^hmB5FVe6&r5ZbRGhBi%1A*-bS~fpkW!{XLOcPqktm=;5ONncJc|n&dL9SK z%r~>MyIv(Ax_gv?&&u`C@p-JWu9xe$V{Dvm1|32wvRx2)vN^dYuEXibpQYChc7JzGs~k&O>eF zh;ivrj znzMnq@~@I5GgoKHByJ@fk-2k@3l=3x}0T#}c*!0~^0%p>-E z==`)U?roltBjzN=Zjj0R{pirX?}J}6|7`;*Zcc*Nr%%t*IbyFqa>;Dt$+{cOibLU> z7#^`i6}5MD$4On5p|C6pSJ$OuBhs|3Th_H}y^r8>S!>d{lEuxIOKcERe>V2p+062S zYulOO9r!C&;}^e5{HAebRk1F-*I2iU?+etkeI@qu`sMZoGV5npGr8-W F{sOt@+Oq%v