From 72057acde5f2f91d4fe949d51347741dae26c48b Mon Sep 17 00:00:00 2001 From: Bora Hwang Date: Tue, 11 Jun 2013 21:51:52 +0900 Subject: [PATCH] [ctxpopup] adjusted dark theme Winset GUI v0.2 1. images are changed 2. more/default style loses arrows 3. horizontal style & toolbar_segmented style aren't changed yet Change-Id: Ifd894af5d3fe364c5579ccea4838b4fcd96898b0 Conflicts: themes/inc/tizen-dark-inc.edc themes/widgets/ctxpopup.edc --- themes/images/HD/dark/Popup/00_popup_bubble_bg.png | Bin 4104 -> 4235 bytes .../HD/dark/Popup/00_popup_bubble_tail_bottom.png | Bin 3634 -> 3782 bytes .../HD/dark/Popup/00_popup_bubble_tail_left.png | Bin 3469 -> 3630 bytes .../HD/dark/Popup/00_popup_bubble_tail_right.png | Bin 3520 -> 3641 bytes .../HD/dark/Popup/00_popup_bubble_tail_top.png | Bin 3385 -> 3536 bytes themes/inc/tizen-dark-inc.edc | 24 +- themes/inc/tizen-light-inc.edc | 26 +- themes/widgets/ctxpopup.edc | 855 +++++++-------------- 8 files changed, 319 insertions(+), 586 deletions(-) mode change 100644 => 100755 themes/images/HD/dark/Popup/00_popup_bubble_bg.png mode change 100644 => 100755 themes/images/HD/dark/Popup/00_popup_bubble_tail_bottom.png mode change 100644 => 100755 themes/images/HD/dark/Popup/00_popup_bubble_tail_left.png mode change 100644 => 100755 themes/images/HD/dark/Popup/00_popup_bubble_tail_right.png mode change 100644 => 100755 themes/images/HD/dark/Popup/00_popup_bubble_tail_top.png diff --git a/themes/images/HD/dark/Popup/00_popup_bubble_bg.png b/themes/images/HD/dark/Popup/00_popup_bubble_bg.png old mode 100644 new mode 100755 index a45f02b6fd8b10ad7565cbb55d905d0c255a5d5b..ad3740b9c820d39eea6b1d3a18eebe886d200358 GIT binary patch delta 1502 zcmV<41tI!~Ad4ZezzTo1Nklbfy2^tLDc-!Q zE;2o{t5#C!X1Y4mr(adQ_r6sK*%s{aef>B)f*G~f{e;F0+97|_27BnV_5jhnf}!Jg z7Z6?oP+MR$^V}N{F9C%XD0DpI-q)7SY35$1z+2()5>PfESLLjyEkI`HmF0JBv0xWm zm;&Vj5zM_fYcDKTv<*K+fY4~89K%r?|3mu>H}jr$mV%g-gG>Wc1VE8W;mnU0pzSkt)&P=r%H!!1mI@6Zdgb73U>s1}ct<+sCK^Kz>2M4kmO_7rrJ}PsWZXvvT*z3Ber-j7 zI#2(I>X;$(SxemOrn_F@=D*AOxC3KF$$x7(-p8%K|R z*t)lVYvbHt00AoI$*EA`Of=?_2w&^+q;=%s{4mEh~s~FVs>t!aBt)1?;R0{Glmo?4w_r) zBLIkI<`$<4h2m>lJA06I+1lBILZP@kGq*Tp%xRk&VM9V;0kS#g^Ep?p%r9?l?+UGT z=3rWD*xcR~<;wgr<3@bKHWVpIq%DjJ^P^)+`v*1XSJ^+PL4I^>iSdnsxDYO6>l%vO za*uyZOc;h?G|_Ce`Uci)wIB?m3C3ChGpf1(g=aX`<*X4gR7&>^OeqbB7+Rtjk&-=h zfuRMI8T&{|6&`nNy^K>$jr7STi$)34My#>vi_=zixKg_P|-;^E=GfyKi)kh1-N z$&?d|{B6z0Z1OWFlgXoc?Z>Cb$NB~~UbqU4M*R)}vnj;v;-NjI=L-^9b?et#mC1jS zLdg^jhUY?KR__>3_S_YN^C_n#?n6rBGvk#?gw+!*d z6mTT7pjg4uqWZ45P0F_3scw8bJGXyOn4PYarA$!D1f)zZvHA%Zxe~*~wIaNXrD)F%xrz;}afCw3}G&03f02rE?TbwFSFRbMASC_&tnm|OaoJ}cp zB4zu2qfx(8-CSS2yZ%$vfH@%+qgGRl8|cy%Z3-||sQN8&o0Sg3Hlz2`g#>>%?cTP9 zYRj-S)4?n@CAh1!0I^OwWW;^C2ds@Po5T{Jb~>5mHd32d(>15MwrfL2d}y;8=j#&a z&&FRupc0>O$_A#1MO-_Foz7*wRhuxd%F{V_fzjdEnNt*w+sZNbj{C8>o-l2>B-8uU z0JlqzdM?QvEeU{NU%yzA_hbB>|otC*{%xepBR1RXj0-yIT5d+u|r z&-X|lz<`hSUDmSys)LxlzJtAVu9x;%r@v3kVduXG0K~m={}*B~rvLx|07*qoM6N<$ Eg4$%?`v3p{ delta 1370 zcmV-g1*Q6nA&4NbzzTmeNklux-0`u1YBp zMG-jX2*XekLLPr}&OhDS+WK7q%!4eb!y$qo z7$r&a$>!$f!xSpc0X#QY9+bVdw)Pnzia(rIc$S1O|hFlu~}Zxw-i{fT#-2 z6f6(QSzTRypHlkW+}s?oEbCI|qBxGx@AqXK#~-%a?MHtAL>Zh3n3_{o2DQAr{Oa`d z^v^RhGgFrpDcv~dI668S9UmXRv%S6jhXNPtIj6GFiYk~z%LZUG#=c~XT^SSrxULJv zSc5V4Mb-|bU8L@kN*#t40DEa^sYM8Ri!pZP%Ol1Z2qAATEiJWDFiQa=reJz$w*few z=iOzD5lnx`7-PiqymtXOIbg(ef>xtt0kA2h>sL7hb#ojCl+tx&II0DtR>ai&atI+W z*|t3~uyo>oIgOZ}XQXb9okk4645gFX<)jt+IVH!eIypv)Cglt61jYsCXvL#2&rF75 z);rh5tOBsw<(^(cFnZo{p9gncjO0Mojujr~c3Nht^8&=sY&H~K4zqKSb;QG_^-|2CECXvGgt_d7y}r$UH{fe9fX zgm_w_dq|Ur>C#uy>-ByL!!Vf?SQv(Juh;uAN7ON11nW9q0zmfr{SN2+aTtb^fCA_I zmwtc0zpJ*XOp>dLSfVIIaktxj5ClQUIlnR}&N+f02)o_x14R-jRjbM(b_NPSG#Cu_ z4h{~!@qItJib4`a5q#fI4h|0P4F-cfMX9QUqb0eef<@^ZB08PU6W{mmA08eiml-+E zISvmG6W{mmcRHPo?D;t|TrQklF%)ABj01mgc6N4tSXfx-0r<%CJT`6}Bn(3YK@jfm z?|-|ux3`f#mup~gS-H=X-~K1L0dN5{0I<}(?09;5`h~^C#k-A0>ySuyJA0Hog0feas%JE16J%y~&70<{50Hy#mQ_p_@ zv-2s>^PZodpI>h@8ZF0hUZj-XNjt;DMoE%96GHqm8jZI0_xFDdg5X~OCjf@2XF%Ec zi4wij;bbqw*g=;84&GdXKbw}F-RxP0Qe9n4aqzykwBQsQdlwRjKxn}gopZ>ro zr=j}yjv^rtP0%DIb7hwNk(SFD*ruWVf&N-GbeM cU9SB%0Ioj=7mOJLJpcdz07*qoM6N<$g6dI#!vFvP diff --git a/themes/images/HD/dark/Popup/00_popup_bubble_tail_bottom.png b/themes/images/HD/dark/Popup/00_popup_bubble_tail_bottom.png old mode 100644 new mode 100755 index adcd374a306e9461e4e17d1bf9819bfcc8d38972..c1e6d8b8a9b239fcafe4d71dd2e9eb4d9d3787f2 GIT binary patch delta 1046 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 T{M2TC00000NkvXXu0mjf(f_nM delta 731 zcmV<10wn#e9E}^WzY2c>xJg7oRCwC#mrrZdKp4iKNhULSXOi88#ch#g>4tWTU<=*Z zZawLxLZN~nc=OUrJ&8r}q+Y}i;Gq`}9y}Dkjo`u0(W|(b#7iPEZ0)+uW_$337jg;w zc;4szGb~M0T&Hkw&Eh}MWx?n9i7{3=$nNfL%Ub*CS}0_UIhcP;Cf}u$kN7e{c6N3o zW9&m5$H!q9I==5?X+WdV$XIL7gb)$r09cX`lpPiqdzm4Pgwboh?(VzaDXE4rd zYGX`4Ns=#8$~_{2>$=Npdt=P8we}kk?FB(F6{Z%2Mx#+XNs`Z;^Ftzn=Xur7p?^^2 zp|$p-@B1rS>&1T!#>-+n9#b60r*Rw~H5v^jrJP;;s!L{!xsxQxnUpdrw(~+)$F$hq z-gY_X@2#~jwbov_oofXe4u_j*nw|+E%th^7+qNGLhtHBE`AS6QZ|z)%LM)0R55Vm- zO{L>hGt#bNY9~u?YisMkb=^}Ux;blmR}I867!JS(pqqcq=E~aI+B*P;&1RDcA!-M5 z0SEvJK$vB)zP^56Yki`WYR#io6+jw50HBe5Qy7Mwe!qX>`~G;Abx~!>yu4%?l+F~B z0KAQjjR#7pBdxVkO4VX&w*W;MjLNhT(IiRI`p(hcjhFl*?1-v|6p8*XzBh>lt*>h{%CF04abU zbv+c*LMB;S05O1{86X1?*Zp$MfhGm0Nv4nkAX&!SzN}Ubi3-L~77Z7Im3>@Hol zUZ!TPHJYWgJvhl^lig(IH{bWo{AX3sXcU>$vXEizKhWQr>d=4DQ=_wU;hM4%vtP*o z4Y#lT@tcx-X3fnnR23H$y4;NabVgWar(F2v^k}SRuiOGM^w9afQ8en|v^^7=&C>Mjl;c=Blqdqq^J>zh?ywao6r~flVQ9Mwn%MaAl9^akz zYR_>zM(s|p!BD={T-;rI@I-w^Tt5V15!u;UDverQUA=SPY5*#wW2u)5Q@ODO2E8sq z(XR6yEf4Pi5D8E;r9gUJKDKY$jKE}QyuJ112|wfT0LTF#5g0{KihwH0Y%muaq%U8; zH1u`8Yy^M60ayiK5kLgMQc5h#+mH*3$%q_HHrw*%=_S@ryJN>k+!HGfRAw`y)Mko0 zD5|Nu{aHOxLIA*%9#cnBnxB6HTB}_HtJ#R$b=ui?9W7UA$M6W5Tp(60kj|0!O9UwS zp|)9yv8mh!+U4$g^6>7}s3Zw8RbmjFOd(MQlstcha&j~%FR>tRLoVOj+j(_tF_XC;zsRek}gD6_$2 z)JuOu!$S@IJ+JS}R9TP##j6rMS$84&w?9`!K>q$gGRCwC#n9XYwK^VrLWRu+_U0aI*!J9eQixfJOR{ww= z1P_9Lf(H@AyQhL6co3mINe|-1n~0b8Af7Cu6hsJE#I&R(1Ze{cNj5vP$;{4rnZOz& zYCgI-_`v#>1ddJqJAl+qhhk<>aK&Pyp@6GEP?tgK{X zUpg$yLO!2Qn5KD42=RqddNua7ED{feAP9B{A&(Xp7me5#R~-*&(=_iJhOtWsS%`hL zkHiC2N_{4T+?$H+M>3g27={*r%Y{P01Tb{Mr$&YGJP&`I^Y2QjyQNa;4FIKq!czt6 zcDracn<0Shqobp>X0v$$z|=tDuu!RCRbh-ZJkMJ{I5>Cdh#t3LV$A) z-}iS94-Yq7*RA)`pznx@12M+nc^+eoJ>TEo-_lBS0Qh?J)KSCw=dXZ*AOPnaob#`> zTJ4GBI8}c=c?SRo!1UnyexQNIZ)(mtJkRTL&R>?x*6a1h$H&Lt^n`vyl^#qdV&sw9H4w=6eYmcxgb>^1a(Poq$p^H@?^8vM(x%@6 zwcBlQ&QBc2S+CVBjYgxb-+GW&qU}+W+`=XRTmq2M=VE{=a#&S{ z`S+C46H7f=uU(x1UOAOY0r2#`NNET$iYns(;<{Z*Lj N07(Z$PDHLkV1hPLZ}b2F diff --git a/themes/images/HD/dark/Popup/00_popup_bubble_tail_top.png b/themes/images/HD/dark/Popup/00_popup_bubble_tail_top.png old mode 100644 new mode 100755 index 0ab75d3f7d2b24a0fbfcfe86ffd28ce047fd3a0a..4bfcac03b6fdc4e0147e132cbd4f01d6d82bc8bc GIT binary patch delta 798 zcmV+(1L6F+8qgcCzzTo+Nkl{ zw8gOKS>4=w?#-9)H<=tn5Cqsyg~C3o0#E^{08{`f02P1=KzV;IDFDFOorgI;WVYIi zYZO&6vG)v<6I*LR5dHvVQ-;Y2B(d&4f8$MQ>A?oW=W!Tua;Igo=d$0JQdK(+7VbbimHL z|LOJmg5Yp^Bn(qEn@x16$f(es{*n6xCT}rWxRi}13kQF(SiGul@cK)!(V=4Ow6+f@ zDk<{W*M&vc*!Z>UJsa-=n#9M|-9v3+ETNg20RWU?s%Lq(SL*iq(_RX#tb*0XBQ!-# zA1ad-WeSC6YNuC!?fLrphQeg#GS1k-Iv~6nsW`1UH%SS$_;Ml;YP@#=qsN{gq84NYZ7sjQy~1XoJ(VJA_% z%L5)?pt!nP@iFOJLUsg7hUw`axl7>kb~9_w`-r+^<^acJ&Dw#{M>|1nj|@?%bqq}s zFTQ;@K|H>mcOXF!;LE%bC<=divSU!WqoHIwG|kMpJbtOu?c1|K-s1}Z@AOJ&n)$Td c((e`l0Fg!(&m8@U>=zzTn4NklgZ2C9K-pc<$KT6I=+{TPi#ja9H*#*jB}!{L8$pP7$OKdU?_GlS=O zRbgN-7^KYnhnca_XzWcUli%|np0z7Cw6M@>wG;sS3W9)|&8C=6r{g3^Zd}Hcs0srB zVry&bP-{I5f&h#$fQT^>eE|SD8@n`ARYS7Z>)m7KeMDTmAR=(iJD!I1AtFSlC-N>5@lfkKtxe=q_w_v+Ri+_?*k&P6VbRz>B<@s z{eJ(EbM842E$v7|pp?2l7z|#QEuAQ1r_<>~LWpB)t(Uh|AR;*D-tFw{bjnyN3M2qP zgkkv27!zr&b3al_0TG2tsh?WwMo}nH)J~RVuar^`FDif4+03?sVYl0TQ?zuV2u!!z zy$t~G&zr<~K}2BYgWcWTQ4veIh7eKuzW*Z#f>0?{8c0eBMC3~;#~T|PI?t5Ivy-Oj zTVu?fAP6d-!iWgQn6%w)f5@{WE`sUxdUu)mph~IEn@`OAvfuANxCm;gp*W672=RTU z`|>wIA)tNPY)Sw)+1}o^MGY6 zhTxognq}FO^Pv7SlqAVI0DQI9iV7FELb29*0C1G1>E<#+3p+$~f{2?%cH^qiS_2}s f5OI9g(%%69a^Y*bM)i%400000NkvXXu0mjfTB$W4 diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 7740ed8..542747b 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -101,24 +101,24 @@ #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20 #define CTXPOPUP_WIDTH_MIN_INC 386 -#define CTXPOPUP_WIDTH_MAX_INC 700 +#define CTXPOPUP_WIDTH_MAX_INC 692 #define CTXPOPUP_TEXT_MAX_INC 660 #define CTXPOPUP_ICON_TEXT_MAX_INC 603 #define CTXPOPUP_MORE_TEXT_MAX_INC 603 -#define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 22 30 +#define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 26 26 +#define CTXPOPUP_BG_PRESS_COLOR_INC 43 58 175 255 #define CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER 8 8 8 8 -#define CTXPOPUP_SHADOW_LEFT_PADDING 10 -#define CTXPOPUP_SHADOW_RIGHT_PADDING 10 -#define CTXPOPUP_SHADOW_TOP_PADDING 8 -#define CTXPOPUP_SHADOW_BOTTOM_PADDING 16 -#define CTXPOPUP_CONTENT_PADDING 4 +#define CTXPOPUP_SHADOW_LEFT_PADDING 14 +#define CTXPOPUP_SHADOW_RIGHT_PADDING 14 +#define CTXPOPUP_SHADOW_TOP_PADDING 14 +#define CTXPOPUP_SHADOW_BOTTOM_PADDING 14 +#define CTXPOPUP_CONTENT_PADDING_WIDTH 1 +#define CTXPOPUP_CONTENT_PADDING_HEIGHT 8 #define CTXPOPUP_ARROW_PADDING 1 #define CTXPOPUP_SCROLLER_PADDING 8 #define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18 #define CTXPOPUP_SCROLLER_H_MIN_SIZE_INC 18 9 -#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 22 -#define CTXPOPUP_ICON_CLIP_DEFAULT_COLOR_INC 255 255 255 255 -#define CTXPOPUP_ICON_CLIP_DIM_COLOR_INC 255 255 255 76 +#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 18 #define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255 #define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 76 #define CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255 @@ -127,8 +127,8 @@ #define CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255 #define CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC 1 #define CTXPOPUP_SEPARATOR_PADDING_INC 20 -#define CTXPOPUP_SEPARATOR_COLOR_INC 45 45 45 255 -#define CTXPOPUP_SEPARATOR2_COLOR_INC 91 91 91 255 +#define CTXPOPUP_SEPARATOR_COLOR_INC 29 38 60 255 +#define CTXPOPUP_SEPARATOR2_COLOR_INC 98 102 117 255 #define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 45 45 45 255 #define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 91 91 91 255 #define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 74 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index 42ced68..5f41d41 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -100,22 +100,24 @@ #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20 #define CTXPOPUP_WIDTH_MIN_INC 386 -#define CTXPOPUP_WIDTH_MAX_INC 700 +#define CTXPOPUP_WIDTH_MAX_INC 692 #define CTXPOPUP_TEXT_MAX_INC 660 #define CTXPOPUP_ICON_TEXT_MAX_INC 603 #define CTXPOPUP_MORE_TEXT_MAX_INC 603 -#define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 22 30 +#define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 26 26 +#define CTXPOPUP_BG_PRESS_COLOR_INC 43 58 175 255 #define CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER 8 8 8 8 -#define CTXPOPUP_SHADOW_LEFT_PADDING 10 -#define CTXPOPUP_SHADOW_RIGHT_PADDING 10 -#define CTXPOPUP_SHADOW_TOP_PADDING 8 -#define CTXPOPUP_SHADOW_BOTTOM_PADDING 16 -#define CTXPOPUP_CONTENT_PADDING 4 +#define CTXPOPUP_SHADOW_LEFT_PADDING 14 +#define CTXPOPUP_SHADOW_RIGHT_PADDING 14 +#define CTXPOPUP_SHADOW_TOP_PADDING 14 +#define CTXPOPUP_SHADOW_BOTTOM_PADDING 14 +#define CTXPOPUP_CONTENT_PADDING_WIDTH 1 +#define CTXPOPUP_CONTENT_PADDING_HEIGHT 8 #define CTXPOPUP_ARROW_PADDING 1 #define CTXPOPUP_SCROLLER_PADDING 8 #define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18 #define CTXPOPUP_SCROLLER_H_MIN_SIZE_INC 18 9 -#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 22 +#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 18 #define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255 #define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 178 #define CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255 @@ -124,10 +126,10 @@ #define CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255 #define CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC 1 #define CTXPOPUP_SEPARATOR_PADDING_INC 20 -#define CTXPOPUP_SEPARATOR_COLOR_INC 45 45 45 255 -#define CTXPOPUP_SEPARATOR2_COLOR_INC 91 91 91 255 -#define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 45 45 45 255 -#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 91 91 91 255 +#define CTXPOPUP_SEPARATOR_COLOR_INC 29 38 60 255 +#define CTXPOPUP_SEPARATOR2_COLOR_INC 98 102 117 255 +#define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 29 38 60 255 +#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 98 102 117 255 #define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 74 #define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 74 #define CTXPOPUP_ITEM_DISABLED_COLOR 0 0 0 0 diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc index 8f63641..4c38c64 100644 --- a/themes/widgets/ctxpopup.edc +++ b/themes/widgets/ctxpopup.edc @@ -40,7 +40,7 @@ sounds { group { name: "elm/ctxpopup/layout/default"; alias: "elm/ctxpopup/layout/copypaste"; - max: (CTXPOPUP_WIDTH_MAX_INC+CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING) ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*12)-CTXPOPUP_CONTENT_PADDING); + max: (CTXPOPUP_WIDTH_MAX_INC+CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING) ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*12)); parts { part { name:"top_padding"; @@ -366,7 +366,7 @@ group { group { name: "elm/ctxpopup/layout/landscape/default"; inherit: "elm/ctxpopup/layout/default"; - max: (CTXPOPUP_WIDTH_MAX_INC+CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING) ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8)-CTXPOPUP_CONTENT_PADDING); + max: (CTXPOPUP_WIDTH_MAX_INC+CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING) ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8)); } /////////////////////////////////////////////////////////////////////////////// group { @@ -696,7 +696,7 @@ group { /////////////////////////////////////////////////////////////////////////////// group { name: "elm/ctxpopup/layout/more/default"; - max: CTXPOPUP_MORE_WIDTH_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*12)-CTXPOPUP_CONTENT_PADDING); + max: CTXPOPUP_MORE_WIDTH_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*12)); parts { part { name:"top_padding"; @@ -1022,7 +1022,7 @@ group { group { name: "elm/ctxpopup/layout/landscape/more/default"; inherit: "elm/ctxpopup/layout/landscape/default"; - max: CTXPOPUP_MORE_WIDTH_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8)-CTXPOPUP_CONTENT_PADDING); + max: CTXPOPUP_MORE_WIDTH_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8)); } /////////////////////////////////////////////////////////////////////////////// group { @@ -1114,8 +1114,8 @@ group { description { state: "default" 0.0; fixed: 1 1; - min: (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING) 0; - max: (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING) 0; + min: (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH) 0; + max: (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH) 0; visible: 0; align: 1.0 0.0; rel1 { to:"clipper"; relative: 1.0 0.0; } @@ -1203,8 +1203,8 @@ group { description { state: "default" 0.0; fixed: 1 1; - min: 0 (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING); - max: 0 (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING); + min: 0 (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING_HEIGHT); + max: 0 (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING_HEIGHT); visible: 0; align: 0.0 1.0; rel1 { to:"clipper"; relative: 0.0 1.0; } @@ -1778,8 +1778,8 @@ group { mouse_events: 0; description { state: "default" 0.0; - min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; - max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; + min: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT; + max: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT; rel1 {to:"frame_shadow_left_top_padding"; relative: 1.0 1.0;} align: 0 0; fixed: 1 1; @@ -1793,8 +1793,8 @@ group { mouse_events: 0; description { state: "default" 0.0; - min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; - max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; + min: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT; + max: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT; rel2 {to:"frame_shadow_right_bottom_padding"; relative: 0.0 0.0;} align: 1 1; fixed: 1 1; @@ -1855,109 +1855,103 @@ group { } /////////////////////////////////////////////////////////////////////////////// -group { - name: "elm/ctxpopup/arrow/default"; - alias: "elm/ctxpopup/arrow/more/default"; - images { - image: "00_popup_bubble_tail_left.png" COMP; - image: "00_popup_bubble_tail_right.png" COMP; - image: "00_popup_bubble_tail_top.png" COMP; - image: "00_popup_bubble_tail_bottom.png" COMP; - } - parts { - part { - name: "ctxpopup_arrow"; - type: IMAGE; - scale: 1; - description { - state: "default" 0.0; - min: CTXPOPUP_ARROW_SIZE_INC; - max: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - visible: 0; - align: 0.5 0.5; - } - description { - state: "left" 0.0; - min: CTXPOPUP_ARROW_SIZE_INC; - max: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - align: 1.0 0.5; - image { - normal: "00_popup_bubble_tail_left.png"; - } - } - description { - state: "right" 0.0; - min: CTXPOPUP_ARROW_SIZE_INC; - max: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.0 0.5; - image { - normal: "00_popup_bubble_tail_right.png"; - } - } - description { - state: "top" 0.0; - min: CTXPOPUP_ARROW_SIZE_INC; - max: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.5 1.0; - image { - normal: "00_popup_bubble_tail_top.png"; - } - } - description { - state: "bottom" 0.0; - min: CTXPOPUP_ARROW_SIZE_INC; - max: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.5 0.0; - image { - normal: "00_popup_bubble_tail_bottom.png"; - } - } - } - } - programs { - program { - name: "enable_left_arrow"; - signal: "elm,state,left"; - source: "elm"; - action: STATE_SET "left" 0.0; - target: "ctxpopup_arrow"; - } - program { - name: "enable_right_arrow"; - signal: "elm,state,right"; - source: "elm"; - action: STATE_SET "right" 0.0; - target: "ctxpopup_arrow"; - } - program { - name: "enable_top_arrow"; - signal: "elm,state,top"; - source: "elm"; - action: STATE_SET "top" 0.0; - target: "ctxpopup_arrow"; - } - program { - name: "enable_bottom_arrow"; - signal: "elm,state,bottom"; - source: "elm"; - action: STATE_SET "bottom" 0.0; - target: "ctxpopup_arrow"; - } - } -} + group { name: "elm/ctxpopup/arrow/default"; + images { + image: "00_popup_bubble_tail_left.png" COMP; + image: "00_popup_bubble_tail_right.png" COMP; + image: "00_popup_bubble_tail_top.png" COMP; + image: "00_popup_bubble_tail_bottom.png" COMP; + } + parts { + part { + name: "ctxpopup_arrow"; + type: IMAGE; + scale: 1; + description { + state: "default" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + max: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + visible: 0; + align: 0.5 0.5; + } + description { + state: "left" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + max: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 1.0 0.5; + image { + normal: "00_popup_bubble_tail_left.png"; + } + } + description { + state: "right" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + max: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 0.0 0.5; + image { + normal: "00_popup_bubble_tail_right.png"; + } + } + description { + state: "top" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + max: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 0.5 1.0; + image { + normal: "00_popup_bubble_tail_top.png"; + } + } + description { + state: "bottom" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + max: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 0.5 0.0; + image { + normal: "00_popup_bubble_tail_bottom.png"; + } + } + } + } + programs { + program { + name: "enable_left_arrow"; + signal: "elm,state,left"; + source: "elm"; + action: STATE_SET "left" 0.0; + target: "ctxpopup_arrow"; + } + program { + name: "enable_right_arrow"; + signal: "elm,state,right"; + source: "elm"; + action: STATE_SET "right" 0.0; + target: "ctxpopup_arrow"; + } + program { + name: "enable_top_arrow"; + signal: "elm,state,top"; + source: "elm"; + action: STATE_SET "top" 0.0; + target: "ctxpopup_arrow"; + } + program { + name: "enable_bottom_arrow"; + signal: "elm,state,bottom"; + source: "elm"; + action: STATE_SET "bottom" 0.0; + target: "ctxpopup_arrow"; + } + } + } /////////////////////////////////////////////////////////////////////////////// group { name: "elm/ctxpopup/text_style_item/default"; - images { - image: "00_more_popup_press.png" COMP; - } - data.item: "item_max_size" CTXPOPUP_TEXT_MAX_INC; parts { @@ -1973,34 +1967,26 @@ group { part { name: "bg"; mouse_events: 0; - type: IMAGE; + type: RECT; scale: 1; description { state: "default" 0.0; visible: 0; - min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING*2) 1; - max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_ITEM_HEIGHT_MAX_INC; + min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) 1; + max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_ITEM_HEIGHT_MAX_INC; } description { state: "clicked" 0.0; inherit: "default" 0.0; + color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; - image { - normal: "00_more_popup_press.png"; - border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; - border_scale: 1; - } } description { state: "clicked_separator" 0.0; inherit: "default" 0.0; visible: 1; rel1 { relative: 0.0 1.0; to_y: "separator2"; } - image { - normal: "00_more_popup_press.png"; - border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; - border_scale: 1; - } + color: CTXPOPUP_BG_PRESS_COLOR_INC; } } part { @@ -2011,8 +1997,8 @@ group { description { state: "default" 0.0; color: CTXPOPUP_SEPARATOR_COLOR_INC; - rel1 { relative: 1.0 0.0; to_x: "left_padding";} - rel2 { relative: 0.0 1.0; to_x: "right_padding"; offset: 0 0; } + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 1.0; } align: 0.5 0; min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; @@ -2053,8 +2039,8 @@ group { mouse_events: 0; description { state: "default" 0.0; - min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; + min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_ITEM_HEIGHT_MAX_INC; align: 0 0; fixed: 1 1; visible: 0; @@ -2073,7 +2059,7 @@ group { rel2 {relative: 0.0 1.0; to_x: "right_padding"; to_y: "bg";} color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC; text { - font: "Tizen:style=Roman"; + font: "Tizen:style=Regular"; size: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC; size_range: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC; align: 0 0.5; @@ -2112,8 +2098,8 @@ group { description { state: "default" 0.0; visible: 0; - min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; + min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_ITEM_HEIGHT_MAX_INC; fixed: 1 1; align: 1.0 1.0; } @@ -2294,7 +2280,7 @@ group { description { state: "default" 0.0; visible: 0; - min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); } description { state: "clicked" 0.0; @@ -2362,8 +2348,8 @@ group { mouse_events: 0; description { state: "default" 0.0; - min: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - max: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + min: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); + max: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); align: 0 0; color: 255 0 0 255; fixed: 1 1; @@ -2377,13 +2363,13 @@ group { scale: 1; description { state: "default" 0.0; - min: (CTXPOPUP_TEXT_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ITEM_ICON_PADDING_INC*2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + min: (CTXPOPUP_TEXT_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ITEM_ICON_PADDING_INC*2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); align: 0.5 0.5; rel1 {relative: 1.0 0.0; to: "left_padding"; } rel2 {relative: 0.0 1.0; to: "right_padding"; } color: CTXPOPUP_MAIN_TEXT_COLOR_INC; text { - font: "Tizen:style=Roman"; + font: "Tizen:style=Regular"; size: CTXPOPUP_MAIN_TEXT_SIZE_INC; size_range: CTXPOPUP_MAIN_TEXT_SIZE_INC CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC; align: 0.5 0.5; @@ -2409,8 +2395,8 @@ group { mouse_events: 0; description { state: "default" 0.0; - min: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - max: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + min: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); + max: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); fixed: 1 1; align: 1 1; color: 0 255 0 255; @@ -2572,8 +2558,8 @@ group { description { state: "default" 0.0; visible: 0; - min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - max: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); + max: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); } description { state: "clicked" 0.0; @@ -2599,8 +2585,8 @@ group { name: "left_padding"; scale: 1; description { - min: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - max: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + min: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); + max: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); visible: 0; align: 0 0; fixed: 1 1; @@ -2680,8 +2666,8 @@ group { name: "right_padding"; scale: 1; description { - min: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - max: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + min: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); + max: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2); visible: 0; align: 1 1; fixed: 1 1; @@ -2816,10 +2802,6 @@ group { group { name: "elm/ctxpopup/icon_text_style_item/default"; - images { - image: "00_more_popup_press.png" COMP; - } - data.item: "item_max_size" CTXPOPUP_ICON_TEXT_MAX_INC; parts { @@ -2835,8 +2817,7 @@ group { part { name: "bg"; mouse_events: 0; - type: IMAGE; - scale: 1; + type: RECT; description { state: "default" 0.0; visible: 0; @@ -2845,48 +2826,14 @@ group { } description { state: "clicked" 0.0; + color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; - image { - normal: "00_more_popup_press.png"; - border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; - border_scale: 1; - } } description { state: "clicked_separator" 0.0; rel1 { relative: 0.0 1.0; to_y: "separator2"; } + color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; - image { - normal: "00_more_popup_press.png"; - border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; - border_scale: 1; - } - } - } - part { - name:"separator_left_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { - min: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - max: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - align: 0 0; - fixed: 1 1; - visible: 0; - } - } - part { - name:"separator_right_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { - min: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - max: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - align: 1 1; - fixed: 1 1; - visible: 0; } } part { @@ -2895,8 +2842,8 @@ group { mouse_events: 0; description { state: "default" 0.0; - min: (CTXPOPUP_ITEM_ICON_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_ICON_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; + min: (CTXPOPUP_ITEM_ICON_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_ITEM_ICON_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_ITEM_HEIGHT_MAX_INC; align: 0 0; fixed: 1 1; visible: 0; @@ -2910,8 +2857,8 @@ group { description { state: "default" 0.0; color: CTXPOPUP_SEPARATOR_COLOR_INC; - rel1 { relative: 1.0 0.0; to_x: "separator_left_padding";} - rel2 { relative: 0.0 1.0; to_x: "separator_right_padding"; offset: 0 0; } + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 1.0; } align: 0.5 0; min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; @@ -3002,7 +2949,7 @@ group { rel2 {relative: 0.0 1.0; to_x: "text_right_padding"; to_y: "bg";} color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC; text { - font: "Tizen:style=Roman"; + font: "Tizen:style=Regular"; size: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC; size_range: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC; align: 0.0 0.5; @@ -3041,8 +2988,8 @@ group { description { state: "default" 0.0; visible: 0; - min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; + min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_ITEM_HEIGHT_MAX_INC; fixed: 1 0; align: 1.0 0.5; } @@ -3199,325 +3146,143 @@ group { } /////////////////////////////////////////////////////////////////////////////// -group { - name: "elm/ctxpopup/base/more/default"; - images { - image: "00_popup_bubble_bg.png" COMP; - } - parts { - part { - name:"frame_shadow_left_top_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING; - max: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING; - rel2 { relative: 0 0; } - align: 0 0; - fixed: 1 1; - visible: 0; - } - } - part { - name:"frame_shadow_right_bottom_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING; - max: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING; - rel1{relative: 1 1;} - align: 1 1; - fixed: 1 1; - visible: 0; - } - } - part { - name: "frame_bg"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 {to:"frame_shadow_left_top_padding";} - rel2 {to:"frame_shadow_right_bottom_padding";} - min: CTXPOPUP_MORE_WIDTH_MIN_INC 0; - image { - normal: "00_popup_bubble_bg.png"; - border: CTXPOPUP_BUBBLE_BG_IMAGE_BORDER; - border_scale: 1; - } - } - } - part { name: "arrow_area_left"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - min: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - align: 1 0.5; - rel1 { - relative: 1 1; - to_x:"arrow_left_top_padding"; - to_y: "ctxpopup_frame_left_top"; - } - rel2 { - relative: 1 0; - to_x:"arrow_left_top_padding"; - to_y:"ctxpopup_frame_right_bottom"; - } - } - } - part { name: "arrow_area_right"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - min: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - align: 0 0.5; - rel1 { - relative: 0 1; - to_x:"arrow_right_bottom_padding"; - to_y:"ctxpopup_frame_left_top"; - } - rel2 { - relative: 0 0; - to_x:"arrow_right_bottom_padding"; - to_y: "ctxpopup_frame_right_bottom"; - } - } - } - part { name: "arrow_area_up"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - min: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.5 1; - rel1 { - relative: 1 1; - to_x: "ctxpopup_frame_left_top"; - to_y: "arrow_left_top_padding"; - } - rel2 { - relative: 0 1; - to_x:"ctxpopup_frame_right_bottom"; - to_y: "arrow_left_top_padding"; - } - } - } - part { name: "arrow_area_down"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - min: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.5 0; - rel1 { - relative: 1 0; - to_x:"ctxpopup_frame_left_top"; - to_y:"arrow_right_bottom_padding"; - } - rel2 { - relative: 0 0; - to_x: "ctxpopup_frame_right_bottom"; - to_y:"arrow_right_bottom_padding"; - } - } - } - part { name: "elm.swallow.arrow_up"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_up"; - } - description { - state: "default" 0.0; - min: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - visible: 1; - } - } - part { name: "elm.swallow.arrow_down"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_down"; - } - description { - state: "default" 0.0; - min: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - visible: 1; - } - } - part { name: "elm.swallow.arrow_left"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_left"; - } - description { - state: "default" 0.0; - min: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - visible: 1; - } - } - part { name: "elm.swallow.arrow_right"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_right"; - } - description { - state: "default" 0.0; - min: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - visible: 1; - } - } - part { - name: "ctxpopup_frame_left_top"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - align: 0 0; - fixed: 1 1; - min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; - max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; - rel1 {relative: 0 0; to: "content_left_top_padding";} - } - } - part { - name: "ctxpopup_frame_right_bottom"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - align: 1 1; - fixed: 1 1; - min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; - max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; - rel2 {relative: 1 1; to: "content_right_bottom_padding";} - } - } - part { - name:"content_left_top_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; - max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; - rel1 {to:"frame_shadow_left_top_padding"; relative: 1.0 1.0;} - align: 0 0; - fixed: 1 1; - visible: 0; - } - } - part { - name:"content_right_bottom_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; - max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; - rel2 {to:"frame_shadow_right_bottom_padding"; relative: 0.0 0.0;} - align: 1 1; - fixed: 1 1; - visible: 0; - } - } - part { - name: "arrow_left_top_padding"; - type: RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING; - max: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING; - rel1 {to:"frame_shadow_left_top_padding"; relative: 1.0 1.0;} - align: 0 0; - visible: 0; - } - } - part { - name: "arrow_right_bottom_padding"; - type: RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING; - max: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING; - rel2 {to:"frame_shadow_right_bottom_padding"; relative: 0.0 0.0;} - align: 1 1; - visible: 0; - } - } - part { - name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - align: 0 0; - rel1 {to:"content_left_top_padding"; relative: 1.0 1.0;} - rel2 {to:"content_right_bottom_padding"; relative: 0.0 0.0;} - } - } - part { name: "access.outline"; - type: RECT; - scale: 1; - repeat_events: 1; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "frame_bg"; - rel2.to: "frame_bg"; - color: 0 0 0 0; - } - } - } -} + group { + name: "elm/ctxpopup/base/more/default"; + images { + image: "00_popup_bubble_bg.png" COMP; + } + parts { + part { + name:"frame_shadow_left_top_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + min: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING; + max: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING; + rel2 { relative: 0 0; } + align: 0 0; + fixed: 1 1; + visible: 0; + } + } + part { + name:"frame_shadow_right_bottom_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + min: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING; + max: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING; + rel1{relative: 1 1;} + align: 1 1; + fixed: 1 1; + visible: 0; + } + } + part { + name: "frame_bg"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 {to:"frame_shadow_left_top_padding";} + rel2 {to:"frame_shadow_right_bottom_padding";} + min: CTXPOPUP_MORE_WIDTH_MIN_INC 0; + image { + normal: "00_popup_bubble_bg.png"; + border: CTXPOPUP_BUBBLE_BG_IMAGE_BORDER; + border_scale: 1; + } + } + } + part { + name: "ctxpopup_frame_left_top"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + align: 0 0; + fixed: 1 1; + min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + rel1 {relative: 0 0; to: "content_left_top_padding";} + } + } + part { + name: "ctxpopup_frame_right_bottom"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + align: 1 1; + fixed: 1 1; + min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + rel2 {relative: 1 1; to: "content_right_bottom_padding";} + } + } + part { + name:"content_left_top_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + min: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT; + max: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT; + rel1 {to:"frame_shadow_left_top_padding"; relative: 1.0 1.0;} + align: 0 0; + fixed: 1 1; + visible: 0; + } + } + part { + name:"content_right_bottom_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + min: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT; + max: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT; + rel2 {to:"frame_shadow_right_bottom_padding"; relative: 0.0 0.0;} + align: 1 1; + fixed: 1 1; + visible: 0; + } + } + part { + name: "elm.swallow.content"; + type: SWALLOW; + description { + state: "default" 0.0; + align: 0 0; + rel1 {to:"content_left_top_padding"; relative: 1.0 1.0;} + rel2 {to:"content_right_bottom_padding"; relative: 0.0 0.0;} + } + } + part { name: "access.outline"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "frame_bg"; + rel2.to: "frame_bg"; + color: 0 0 0 0; + } + } + } + } /////////////////////////////////////////////////////////////////////////////// group { name: "elm/ctxpopup/icon_text_style_item/more/default"; - images { - image: "00_more_popup_press.png" COMP; - } - data.item: "item_max_size" CTXPOPUP_MORE_TEXT_MAX_INC; parts { @@ -3533,58 +3298,24 @@ group { part { name: "bg"; mouse_events: 0; - type: IMAGE; + type: RECT; scale: 1; description { state: "default" 0.0; visible: 0; - min: (CTXPOPUP_MORE_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1; - max: (CTXPOPUP_MORE_WIDTH_MAX_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; + min: (CTXPOPUP_MORE_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) 1; + max: (CTXPOPUP_MORE_WIDTH_MAX_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; } description { state: "clicked" 0.0; + color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; - image { - normal: "00_more_popup_press.png"; - border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; - border_scale: 1; - } } description { state: "clicked_separator" 0.0; rel1 { relative: 0.0 1.0; to_y: "separator2"; } + color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; - image { - normal: "00_more_popup_press.png"; - border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; - border_scale: 1; - } - } - } - part { - name:"separator_left_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { - min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - align: 0 0; - fixed: 1 1; - visible: 0; - } - } - part { - name:"separator_right_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { - min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - align: 1 1; - fixed: 1 1; - visible: 0; } } part { @@ -3593,8 +3324,8 @@ group { mouse_events: 0; description { state: "default" 0.0; - min: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; + min: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; align: 0 0; fixed: 1 1; visible: 0; @@ -3608,8 +3339,8 @@ group { description { state: "default" 0.0; color: CTXPOPUP_SEPARATOR_COLOR_INC; - rel1 { relative: 1.0 0.0; to_x: "separator_left_padding";} - rel2 { relative: 0.0 1.0; to_x: "separator_right_padding"; offset: 0 0; } + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 1.0; } align: 0.5 0; fixed: 0 1; min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; @@ -3702,7 +3433,7 @@ group { rel2 {relative: 0.0 1.0; to_x: "text_right_padding"; to_y: "bg";} color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC; text { - font: "Tizen:style=Roman"; + font: "Tizen:style=Regular"; size: CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC; size_range: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC; align: 0.0 0.5; @@ -3741,8 +3472,8 @@ group { description { state: "default" 0.0; visible: 0; - min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; + min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; fixed: 1 0; align: 1.0 0.5; } @@ -4204,7 +3935,7 @@ group { rel1 {relative: 1.0 0.0; to: "left_padding";} color: CTXPOPUP_TP_FONT_COLOR; text { - font: "Tizen:style=Medium"; + font: "Tizen:style=Regular"; size: CTXPOPUP_TP_FONT_SIZE; align: 0.5 0.5; min: 1 1; @@ -4310,8 +4041,8 @@ group { description { state: "default" 0.0; visible: 0; - min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1; - max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; + min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) 1; + max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; } description { state: "clicked" 0.0; @@ -4383,8 +4114,8 @@ group { mouse_events: 0; description { state: "default" 0.0; - min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; + min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC; + max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; align: 0 0; fixed: 1 1; visible: 0; @@ -4403,7 +4134,7 @@ group { rel2 {relative: 0.0 1.0; to_x: "right_padding"; to_y: "bg";} color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC; text { - font: "Tizen:style=Roman"; + font: "Tizen:style=Regular"; size: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC; size_range: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC; align: 0.5 0.5; @@ -4442,8 +4173,8 @@ group { description { state: "default" 0.0; visible: 0; - min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; + min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC; + max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; fixed: 1 1; align: 1.0 1.0; } -- 2.7.4