From 0ff4062673d173f4c8babb2c3497eead5505186a Mon Sep 17 00:00:00 2001 From: nakst <> Date: Fri, 1 Oct 2021 09:40:49 +0100 Subject: [PATCH] new menu appearance --- res/Theme Source.dat | Bin 53108 -> 53190 bytes res/Themes/Theme.dat | Bin 53700 -> 53764 bytes util/designer2.cpp | 17 ++++++++++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/res/Theme Source.dat b/res/Theme Source.dat index 7b86dd0e20783ea3c4c56b461368f9499c1c3c1c..dfae8e72d78a85bd7e5e129682b161beb2c88339 100644 GIT binary patch delta 252 zcmew|kNMbq<_(>ajLnm~BvmKPVwwC-hMnD-fq@~Vp=t6%84)%RyPhxUOLC*O*$pZUu?<_(>ajE$4KBvmKp&lF>llA0VSD>m6oT4M46ah}O$QUZ)Zljk?cunIFU zFl?H9ph11|0*$iGtkO#q8Cxd@iWzRcZIkZ~G{Cz>cCx@6c5yBNZb6_@h6Y9u2?VS_ z(9}EmVq(E&{nkk~i~^ev9h}UIhI_ls+?*D)D3!!#esX5P)w$0jgu<~;SCQQ0HE mEVU>#MZtlAv1Jltzi(<@sb@)QZa`6LaWO==Z8P_o-OK>=Ej{S~ diff --git a/res/Themes/Theme.dat b/res/Themes/Theme.dat index 6427ce77969771578ebed18cdf5017ba3f6538e3..f084e0c7749d01c385f86d8007c3a2fc17286f8e 100644 GIT binary patch delta 4084 zcmZ9Pe@s+Y7RT?s^TVMXE%*k;D)OTa7Axu?s3?x&c2um`jxzjEKn4W_cdVe(LX~x} zC8=v!tvPN(Te8xW-85M?t9k6Mf3PklG+|RWi&+wFs=Jt)I8A9*QMOlbA*MgI|i3*$9|H zVRtFppqa*CnMVmmEhEk}Hya^XN|X$Z(^-QSoPcG1j5oQXFxYd-&MmEseWG}^f+Z;T z+Q9BBEE#Nta&H>gN)taQn1uIdQpPraCR{)m%ilq&#LSY?XRSN5*ZSyo&H!R!coH}E@VAXSW z#`#sSni$6Mj1JHxco>4EF2*8vI|BB#67Me9k?C)i*=Ht158z=OmQ_lHJ_b9cRL2C^ zMTJdLwnYnuVQE$@>=a`s6=no`Ltz%M!%B3kyjNlIU(;wkJDUUSbnQ4y&NoPGRut5q?EHJu)iv4Zl~rr zEwLMxcN7mj`iF6Mp5=*jvpR`V9V_T+;=)|U3RvU~z*9KW3cL)|B8cQuxD1h(13o)W zPNEy}DP+m8*`_`!o;9b*>8Det$g?7g2CHq<(`==NqjPXxl*t-D^$q{3htwj(_qY-L>kcZ&;qv+p@oM+K*4kc0BUMGJ{ zf7ttz7~e-{n$C;XV%gAOaXTNNZQhe2?8SMOau3Zf$rnQN?8EdOz>@H-(i%A%5=1X|T zhwed(wla2W1%42$!yKp|3Pa`V@!uNCg1@n1d{24dGr-trHDgUj@ZD3x*yRSi)*r%m zejVC+#vazQeeB`U>0qO)@tU)Su|a4w3;k8-Lm@d%XKZ*MW3AvJFgNB-?#AziBF4PX z7*yDdpzzg2aV@Dq%NvY&pteSMhny++`GM`6%R`ZDL};{O50)~Yv7u#H{$6YgTI9g* z9H?(bmJIlT`XK9zj5R=MnMe&%AlsptansD$yBu3v&VuaT>j?4!V~=rT0RnVGzSo`x zjK_9zv4!`cs}%@ZiG?o2f}u1h3%^nFj$=znxG#~h38<+Q_Lbn!T__jnaAE^t{HLA7 z=Df(Y5A{C~|1wsL-6!LxMk~~F5|f}o@MJd@gti-Eui{(bImSMN@^GUcj)o!Y0qm3- zTT_Fb`;l?Tm<&%Y2(90a94?wZk?zG$`RI-qb)AJmiS{kXb}dwiv$(!#t=L0p+|lq|~|{nL*ouHVh46UKead&*KQ7 LQN8h0McMxW9>|Gb delta 4063 zcmZ9Pe^8Xi8OL|`ehBe2hj;u49(V{O7(ov~J%uAM0mbBO4&?*|1oT9(sGy{vp&qt& zN{m0S56zH-PH;kIFtshtOQ-%}4V{vi>*O-kDHCZ!Qk*c2GqF>gFcULzCjIWg>9H^K zz1{sh&-?7|v(J0HcV(=mVE}Uh5v*WI3QGW698o}Wc02tA5i(%;rINl(u+)h8#?)QC$pOB5y1z`Z6!i8*d`@H3s|1w*Fo11p$nE57Famz2K#s+<2_(S z%JKITH(LBdu#_m45wNYwS&V{hQ&n%zq6J03 zm=COW!A3c60jrN-9FK7)T|$I2upEf6$es0oeW}dX2X=7o-_GMlXo&72!c|zZl!6@w zJFFDT2-ro1U8n3Qi~j~Jt%_w7?6|_lz+P2Y0BpZ9dr;o1uv=g;3L6J&H|U-mwS2Co z08bzx;iH!9KG0utb&wrqjO(anRpzhitTfeXqV71e7>}cZxJ-IG-b8PgC(>wq6wSuj zg)N@G@UElM_%uF5hvVPjnObzhyPOB<$}`{a3HnXqSK{3A&`g8N>qMcAj>H$xK!J%o zwhZ2{ov>L1@1^s}8$~c#x@ptNnVctRG4{2b`=}^|#AFJcT$)U?DZTuv_WH^^F7Bn$ z2c8CUBqh>?*p<|iY7(7kp-Fnv+JrfMerEx0)gGj;6}(tW$=EOWIqetEr*m#VcC6Zm zt6MpDYS~#9yhKsSny=+x?NQFh=(6Kayi?nqeFtBwl%4Y~AE(-Yyp+D%>=%JN$>bo<4>$RVe!ib~(FxZ@Zq}j; zHX3;`6&2_4GxXEqi@cncl(dUr3GLl_jJitn^r)m#RBxeE#p?_|;2Nj%TmH@mwVJK% zLd?FTeY)+G;BDk}SMXu_ojXU|bJL;i>Dr?0F*;%Q(1j%z6&Wg&NvZ1M+UA&*_%a4o6a-8Ze?w~Aho*49oPX0~r7BTIWTsU{p z8t-OP+b+hQGB1vi1xusrt(Jy{2F40G^Uc>0#`M=+r+EgIRJ_Q$wbv_F=)~9_`e4s7 zp|3)y3SK26X~R|BT-a)m-emIRIJKUdVj*T~>C@UnIJ=^{R4&HrsiFR+h}uV+51$pm zeIc7&OWL2xvGpR~hho|%O}s}te*mnPt~KO{Km+}!;Vf^{S`Q*dN2By0d((9>*`)oe z>1U`6s%id=+i26_H^k6knFgM#l^xm1MfcIr$V%BQZ}5T8XDMxK)x=b5C~3{dLe0Za zqYWI_;{{54zwIB~KfIAK+fif!>dnS$1e9OHSRXVF-GHK=$2T){1A17%*ws~xIoC6G z9qNT9A?F6hh9MK;jqXIua>Q(dy_PY@LB`VR87ptZ8~i@}LqC8P*&l3RJJ{f%xyeS> zFlJuM*Z?$=iGCLPP(Y4T7#rGw9~|HTur&Biyv*1+H-3OXqfk^U{?#?Xhqkq^@CPup z`BiKMqz^JD?EV4Bda0vC`*I zKN*b8Lb4s4AA67zInISo&$GgbH7IGT{s+vtkP^QdPLI8e3Wh zKgbT<$KoF%hAj^7(XluS$b%ZLUd>nnbRDuH9S&?@G8bcP&Wc>unQ>0$7xD860c=Yd z>wxNx140Afk03kL2~BOsVLXl8LQdT1MxY@mxEq_HD;+ERZuEwr>E+0*3$np09yx^M ziF77D=|{oG2TkPTH0Jx2o1XM1Hb?aHa29)zM{KVHlC8aXE@ol*Bph@B{Gm$p>srB)duJ^Q z!ai33cGR=%hwIveLJ9W+l~@cio{w04K75Qqjc{&+lN%|YwPMmzEDGv}W})hBNFAy} oUx5;Zd~I`n)kx`ms2B2;V8_rI`1K)1<}-|SLnGRilT{V}2h_@Y8vptype == OBJ_LAYER_PATH) { InspectorAddBooleanToggle(object, "Use even-odd fill rule", "pathFillEvenOdd"); InspectorAddBooleanToggle(object, "Path is closed", "pathClosed"); @@ -2042,6 +2044,11 @@ void CanvasDrawLayer(Object *object, UIRectangle bounds, UIPainter *painter, int } if (object->type == OBJ_LAYER_BOX) { + bounds.l += PropertyFindOrInheritReadInt32(depth == 0, object, "offset0") * canvas->zoom; + bounds.r += PropertyFindOrInheritReadInt32(depth == 0, object, "offset1") * canvas->zoom; + bounds.t += PropertyFindOrInheritReadInt32(depth == 0, object, "offset2") * canvas->zoom; + bounds.b += PropertyFindOrInheritReadInt32(depth == 0, object, "offset3") * canvas->zoom; + uint8_t buffer[4096]; EsBuffer data = { .out = buffer, .bytes = sizeof(buffer) }; ThemeLayer layer = { .position = { .r = 100, .b = 100 }, .type = THEME_LAYER_BOX }; @@ -2102,10 +2109,10 @@ void CanvasDrawLayer(Object *object, UIRectangle bounds, UIPainter *painter, int LAYER_READ_INT32(position3); UIRectangle outBounds; - outBounds.l = bounds.l + offset0 + position0 * inWidth / 100; - outBounds.r = bounds.l + offset1 + position1 * inWidth / 100; - outBounds.t = bounds.t + offset2 + position2 * inHeight / 100; - outBounds.b = bounds.t + offset3 + position3 * inHeight / 100; + outBounds.l = bounds.l + offset0 * canvas->zoom + position0 * inWidth / 100; + outBounds.r = bounds.l + offset1 * canvas->zoom + position1 * inWidth / 100; + outBounds.t = bounds.t + offset2 * canvas->zoom + position2 * inHeight / 100; + outBounds.b = bounds.t + offset3 * canvas->zoom + position3 * inHeight / 100; CanvasDrawLayer(layerObject, outBounds, painter, depth + 1); }