From 417d0934fc75dae5025ea864a887de814e6f1f61 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Fri, 21 May 2021 22:24:00 +0200 Subject: [PATCH] Straight edges for pages --- data/edit.htm | 438 ++++++++++++++++++++++++++++++++++++++- data/edit.htm.gz | Bin 3779 -> 3890 bytes src/hasp/lv_theme_hasp.c | 7 +- 3 files changed, 443 insertions(+), 2 deletions(-) diff --git a/data/edit.htm b/data/edit.htm index 06be5506..d2d9aebc 100644 --- a/data/edit.htm +++ b/data/edit.htm @@ -1 +1,437 @@ -File Editor
\ No newline at end of file + + + + + + File Editor + + + + + + +
+
+
+ + + + \ No newline at end of file diff --git a/data/edit.htm.gz b/data/edit.htm.gz index 8a9663dcd92f4aa5fa92eac9502c5e02b62b6816..969ebc8a20cc678b1940feeaad8b355740ac44a7 100644 GIT binary patch literal 3890 zcmV-256$o&iwFqz5~yGT0A*xpbS`LgZ2-j@30vDX^slJiQD-Dh!dSN@K$id;l$#{& zpkwATmv+lnin?f%GpMh-l#WVBs2pzT;a08l-I zY{yb;qRMU@TO?o}r#n{cMhw?>+~Dz3i3^WSYUJxmr5?(dD=tNi&~7aKp<;EP^;C^~ z6He+~8F?(KRl^AZ9QVj)TU%T8E_LtwksJ!ICxt4-{1dB@>Sj1Gzk4*`J}eYd5tm{X@t%Q? z8Sf83x^F9$Dd<9mK6&(ctV&w@gt3w#aMXI>GoVqQ3mk>i^SJ24P*3(bdCc{Xm`@cS zv3kHoY0Nz}sF61n5Xc=yF=`n~E)$*A9ksG&(#x{Wyq`vwcQ5E z4p-4)C{tn!qhqNnm6CyR&)fpWzrI`EtQFfb%cKtWR@|k2iTb<`#tFFR`K&&>LBq(m zJ*sGp2ei-1q38oTW^cBN{C)HMYFs(~sV^Jw-&w0OIOz0Y)Wn~S%e}@WJoc&^cfH>m z2>!`ywmS!n#&P-RZ2aN)4WgTVz_4$YIGZ$E@S=nRdaZBeBS4L(7HKmyL;c9 zbPgMQaQ5!1a{tru-oAVN?)uIC*X3`&J@wAHXpcTM`g`N=9^&@kXe7$-<=xT4Dg3>- z*yy&Zap&^r{bv0AH(_&se-v~t%7J&^Q{R29!t4I<=J#*j4a(M}@#5JLezO)$x*)E)MFd_uVB zalsWM)p$DnAzkR6J@g_Puz2lt9($1tW|PcR$+@4?&xWBdDX9BIV##uFq~k14##!WT zLa@#U{N`33(j`M)t;~RMsRXuMf=mLL&6l4kF#Jl<4F5El)to`XFQvg(24$i)eUzT%;ez*kiS2pVV#%<1dP;TbvHHH2^- z?jZvcBc+h40q}7%(J*l!Ad@7c@K}$6xbLYy)QIx>^0`Jnf1O?N=Xb?y@cOKL!-}uN ziqEs!(`4(j;)Yec4y$;c)fGdn$OY8wczuR(p-5uK^=TZRCA*`8#?o>`>&Ou;sO&Qu zy;O_{#E4dk5v<{aSs)K>2-q#MvqPic$X0gi0D&ItXtP?!cz%v3|Eh=XyM zZD9a_4J?zDEYNY0BH#iDs!w6)1TmY1wQU&SDzi4s7#9h5q;P%i-UBqV6f6Mcw+bfN zA&C->J}sU1Y|F6<+Gg|AwuA))r0btgPY#s|uh{QH7OMg*uWgOSWA1>8KJp*x-BZbw zA7vEmQ$_145!+4^0RzdUBLQYx7o9emtc(@N((o8bRbiSM8i2wuPHXkdu#l*C8I-a*yDLKWtQW%CW(Ib^B=d9ChQ2?xL zzpee^*dKp&ZZ`^rx1X0CHeoKX`&hj#Qcd7|Rrtlx1asK>NOF%Dmgvp0N2qoSWJN*p zWxUXM3(xr$*#WqKI72BAWD$s|yO8w_%FqH5fqk?DuB$Nk91J~CKq~=l?xEz5KS*U3 z;DE!cqttE7;I?lOm6a4+N0C|v%O}ReZVd4z`fx^Hz1jwZCoX|o6R-5JSL9y}6m<8O z2MS0W{a+GeWB#`!rYj{*h>B#)g(t_516+z&X8`Hg>@~~}vhew@RSu!%t*>&Bsytoj zLE8~yy7x3ujj^+`1XxM?3~T>Yf9mnkY>AXw`;}{&=HDtfx>a_PTLoQDq(BYDGDcrD zAZo4|c)iVoK8YiD$9fGh#4xbm{^oXfFet%#%n@>IV|cx`h+cCC3tw_0RjpLMs1x{2 zN+dlv0gQY>5Nd9L=upWz$u2(3jfX|byRUPzLZ!^w_`mF`hdx+|y|fMXIX2=8%_&qP zTVN`(-TC%t8;{hxc%8Xj)_0`CzEZyP}<<=b@5tkiMwc_uyGUE#UOrn)^T zK=-+RryQUMIV! zDA82XkW3RcQYerF1RX9hV-6NxP+{NPVAvoU1J{z_MI@mQphyb9Y}WdhNv2pAB~Z+7 zUF=5E_uDcgZ&zY!IVK$>>*hp7cg4~ttf$D^m8jo&+#G$r!IH({xnL)#3k!I-%%iqK4V9&wI}Z6YJ1_rWzWWb!%d}qT#l7 zt;ABfvsfw-u`)}&tXHP^emf#IPL-%;;+p0vyHbb8Hj(hy*eI9_>*N;Tqj!s!#ac)@ z-$>i4h{}D z`4;aZ#or1Vkq3>K&jB-Q*SjFseLW9;MCy@0kGqQ#)EymB^R8x*Knh>em~n<(P9cWK z{SC$`)lyQ4XU5?mG(#iUQ%P(RB)moH7HVotqCHw=cVuR73~J%Z3wyhH9Mw3QzB37^ zVhgjSrjRLx>9UHca)!YIi7|X3KgXgs>ncrM<}i=z|`<|=__Imdk>+q?pBo@bVOa(B5Kcju#bCXcSI1geP1uyNZcV|DCTVWU6WVQe||SOha9K*VAG?)ATmv zWDwIW%83st3c4KYaWfH`-(Ds`t=R;^I zeQYZmE`EuH#)Y{lwl$FB3-ADSsxP|iS5=L1We`x|#SZnnJu|i+u{1*P#B{_Gm{sgT z;2tx$5qlhS0mwZS`K6Xs45*903>g5XMNI6q)fc5{@p$nra-DGK;*ppxzA8a%)0bWQ zqq>DWgw>=*g!Vez@)fU4QeU9pb80RY^MZzMoBDsDzA_NA~hGyGcXg$-myDo5fAKS+PlM&d2aa2Npl2g7#Si0AvMz^I{Pr_MC{V z0q?0LK@IqCiyN_3;zqVYq0@8xQp045sorp)TPlu!KSLnn)g@x?dxt{yc8TGe$UFf` z(S(E82@u+eXCl$#w21QBPrbDR@U{<_%O&AFD%H^_KkCeqx{TC>|$2V#$p2nTp-6PypQ9D!C@0vf|F zg44Dnd*zY7zR(|uX4G8YA>)MkTjgZd>$zF4VV0Qy1Jnc_`h)8~0e6K1cz`Vc0CO^& ALjV8( literal 3779 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 diff --git a/src/hasp/lv_theme_hasp.c b/src/hasp/lv_theme_hasp.c index cedb3444..dcd8211e 100644 --- a/src/hasp/lv_theme_hasp.c +++ b/src/hasp/lv_theme_hasp.c @@ -98,6 +98,7 @@ typedef struct { lv_style_t transparent; // Objects with transparent background, like Checkbox, container + lv_style_t screen; // Background pages lv_style_t pretty; // Background gradient lv_style_t pretty_color; // Primary Colored gradient // lv_style_t bg_click; @@ -271,6 +272,10 @@ static void basic_init(lv_style_int_t border_width, lv_style_int_t outline_width lv_style_set_border_width(&styles->pretty, LV_STATE_FOCUSED, outline_width); } + style_init_reset(&styles->screen); + lv_style_copy(&styles->screen, &styles->pretty); + lv_style_set_radius(&styles->screen, LV_STATE_DEFAULT, 0); + // Primary Colored gradient style_init_reset(&styles->pretty_color); lv_style_set_radius(&styles->pretty_color, LV_STATE_DEFAULT, LV_DPI / 15); @@ -1049,7 +1054,7 @@ static void theme_apply(lv_theme_t* th, lv_obj_t* obj, lv_theme_style_t name) case LV_THEME_SCR: list = lv_obj_get_style_list(obj, LV_OBJ_PART_MAIN); - _lv_style_list_add_style(list, &styles->pretty); + _lv_style_list_add_style(list, &styles->screen); break; case LV_THEME_OBJ: