From acf5fb353152bc997861c0fdb2570891101713d8 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Tue, 13 Jan 2015 16:25:45 +0300 Subject: [PATCH] update checkbox resources; support fixed layoutWidth, layoutHeight --- res/btn_check.xml | 51 +++++----------------- res/btn_check_holo_light.xml | 65 ++++++++++++++++++++++++++++ res/mdpi/btn_check_off.png | Bin 0 -> 360 bytes res/mdpi/btn_check_off_disabled.png | Bin 0 -> 241 bytes res/mdpi/btn_check_off_focused.png | Bin 0 -> 353 bytes res/mdpi/btn_check_off_pressed.png | Bin 0 -> 376 bytes res/mdpi/btn_check_on.png | Bin 0 -> 514 bytes res/mdpi/btn_check_on_disabled.png | Bin 0 -> 376 bytes res/mdpi/btn_check_on_focused.png | Bin 0 -> 516 bytes res/mdpi/btn_check_on_pressed.png | Bin 0 -> 528 bytes src/dlangui/widgets/styles.d | 6 ++- src/dlangui/widgets/widget.d | 7 +++ 12 files changed, 89 insertions(+), 40 deletions(-) create mode 100644 res/btn_check_holo_light.xml create mode 100644 res/mdpi/btn_check_off.png create mode 100644 res/mdpi/btn_check_off_disabled.png create mode 100644 res/mdpi/btn_check_off_focused.png create mode 100644 res/mdpi/btn_check_off_pressed.png create mode 100644 res/mdpi/btn_check_on.png create mode 100644 res/mdpi/btn_check_on_disabled.png create mode 100644 res/mdpi/btn_check_on_focused.png create mode 100644 res/mdpi/btn_check_on_pressed.png diff --git a/res/btn_check.xml b/res/btn_check.xml index c8c2bee0..c38e9325 100644 --- a/res/btn_check.xml +++ b/res/btn_check.xml @@ -1,65 +1,38 @@ - - - - - + android:drawable="@drawable/btn_check_on_pressed" /> + android:drawable="@drawable/btn_check_off_pressed" /> + android:drawable="@drawable/btn_check_on_focused" /> + android:drawable="@drawable/btn_check_off_focused" /> + android:drawable="@drawable/btn_check_off" /> + android:drawable="@drawable/btn_check_on" /> - - + + - - - - - + + diff --git a/res/btn_check_holo_light.xml b/res/btn_check_holo_light.xml new file mode 100644 index 00000000..c8c2bee0 --- /dev/null +++ b/res/btn_check_holo_light.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/mdpi/btn_check_off.png b/res/mdpi/btn_check_off.png new file mode 100644 index 0000000000000000000000000000000000000000..ae0bd562fdc849232298c5df31be961e681d04fb GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~BQK8$)1Hob9YCS4o-U3d7N?g^_Vr^ns^E@0;WE?V6&x zQ;Nmur=Qqk_TMzoZgE*=HsP%V>kP?vZFg2^8nryxAvv>9M!|9|o1(h&7AcQKQElQQ3<&u4CRp3SN7>Sc)X4O?BF zwbq4grsW++{&&g^vtO^C{M)g8-*e5tb8nAre$4#PT<*7l=gbgb05EvE`njxgN@xNA DJ*bhx literal 0 HcmV?d00001 diff --git a/res/mdpi/btn_check_off_disabled.png b/res/mdpi/btn_check_off_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..7f9630a74cca1bbe5c0c18fe482bba0c1c4dea19 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~BQGz5%%6NKZJVX%d|kDnVpd>RK2!wZL{P%MTVrbbiO;yM`R3M`-IFq;Hks(S!YLdhvB~{ fwL5u>Po?gWV-VWv=)SrG=n@7`S3j3^P6(pS*z}wuaEcj z4h`keWUq*+y)vEaxcF`gQC-nEoC2Wc$dFBd|CC! z=ih$6=Q(H76)Eyd-=)>WLB(uVLv*+eA7_JB3v*yvKvc`h1HO8H8{D37?K~JNz}5Zu z$^nynKU+Sj!j}OODZAKvY#1|gtwpq0Sf|hMW>GQHkTtv7_u6O14g=1BSzBH{pLHUk s?z+hp^|0#lhd-+0f{aR}r#60Nc1%}TI;;0=9nj|tp00i_>zopr0PHw}p#T5? literal 0 HcmV?d00001 diff --git a/res/mdpi/btn_check_off_pressed.png b/res/mdpi/btn_check_off_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..1dc226ad3ce4219e160a0f7c1de964849131b7c8 GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~BQK9NpV6{&ISdSpte!58Ar_~XPPPp?Y#`FI|GV&zEt9I<`QJS! zty(3)%x(qi)MyZZ;h5+V}CwYA-R6Bk;Jok5FlWRVLn~;2^-?Lg zu5f;CPU;2#&x*y%t7wgg;QKz-TAr`1HFi+r^_%xi;_ghEPhSmRev~QB43kO4nnyTK zuBWFSiwJ$a-K?x{aA+!w{X8I>j)xo6P)bO|I(fVEog-7BFP9)c*oC#W@!kKz_I8(K zq7&C?BObfO=BquFQaqh}fLHOF3!P8WsU+S%c(?nTu2h^4AAeCktdPsb7f`~9Reh(o)DMeK4@DX%GVUEf?naCpqXdPj!(9enI5!ir8 z_8~^|S07*qoM6N<$ Ef&wq&kN^Mx literal 0 HcmV?d00001 diff --git a/res/mdpi/btn_check_on_disabled.png b/res/mdpi/btn_check_on_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..683aaeb781cf23cee719ea4be8e489a9aeca7ef8 GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~BQGzb>GETffd(+Ldb&7~+WNzt)ZOpX__TaBJJ^ zT?x;!8-3??95`ce%z>kETkgR#9glxpIjDE?jDS-@q*zHTyQXSeV#775zQ+f?|E*P< z&ey?F8k;;ztzusLvP=h;=~wM#42-7)C8SMB?W~-ac-ySze!JnbxP)Sbr7i+2)(Txp z2A?0w-`Vz|YVQOU&K^SrrIy4BiBE5}_cTuln!Y5sQRno(tv+8$q$T+ua~I$Az7^m$ R5g1?$44$rjF6*2UngIV$mIVL+ literal 0 HcmV?d00001 diff --git a/res/mdpi/btn_check_on_focused.png b/res/mdpi/btn_check_on_focused.png new file mode 100644 index 0000000000000000000000000000000000000000..84b5e2c40e33ab8be29ce5f905a9977a9b119cab GIT binary patch literal 516 zcmV+f0{i`mP)W4-n1D%TX zunY+nxY_+TqmnS$M=3P0<$Bm5H~1C+-+CSdY4#con&c0^HgIMAP|da8Yn1K5SM}oacilI9R&XX3(mzs z(4|8WoSk$K+MyBzmqLGlNEIVOu@cM`W2`Z`*Tn{7+6$6*I>R~7d0#k3Se8XOQUKBE z_s)F><8u?D003B=ee=&o0n}G%7)p@(lP8mNn4DQCcJNp88~Y`IKEH=d;ukyn$Gnb3 z(5tIUBivSZqh6?`5Da%bU~=gr$<#T!{Q;hY+S~yJ>r&9=HTk@?M>2KJLw^J90Uu{s zyQojz9c(srf-N2ly^@f(mX-DINGTZ`3G>ssDp^zn2zpI?B1hs!f*yYzn_mt%IZ5-# zSI+jnam z{XWIpSj%9fgG<}SQz_j6hv__Kjm}UsfRdmIc=0^Qg$=rtm=)4Jf>4Th(q?odjM5}} zg=8Sw$w4}Y?SP?#J7D~=34o&nFJn(}fWu6lY~H!K3;qwdeV+G`DEAvBW$GH6+j4); SSR(@f0000= WRAP_CONTENT; +} + /// Align option bit constants enum Align : ubyte { /// alignment is not specified diff --git a/src/dlangui/widgets/widget.d b/src/dlangui/widgets/widget.d index bed6141a..71ed5051 100644 --- a/src/dlangui/widgets/widget.d +++ b/src/dlangui/widgets/widget.d @@ -1056,6 +1056,13 @@ class Widget { // summarize margins, padding, and content size int dx = m.left + m.right + p.left + p.right + contentWidth; int dy = m.top + m.bottom + p.top + p.bottom + contentHeight; + // check for fixed size set in layoutWidth, layoutHeight + int lh = layoutHeight; + int lw = layoutWidth; + if (!isSpecialSize(lh)) + dy = lh; + if (!isSpecialSize(lw)) + dx = lw; // apply min/max width and height constraints int minw = minWidth; int maxw = maxWidth;