From 5a9d6bec858861e8f08df6e134a67c60115f7e76 Mon Sep 17 00:00:00 2001 From: Jaehwan Kim Date: Thu, 29 Sep 2011 17:38:02 +0900 Subject: [PATCH] [*][scroller] apply nbeat-hd and nbeat-black-hd --- themes/groups/scroller.edc | 67 +++++++++------------ .../00_scroll_bar_handler_bottom.png | Bin 2867 -> 2857 bytes .../nbeat-black-hd/00_scroll_bar_handler_hor.png | Bin 2972 -> 2840 bytes .../nbeat-black-hd/00_scroll_bar_handler_left.png | Bin 2873 -> 2865 bytes .../00_scroll_bar_handler_middle.png | Bin 2839 -> 2864 bytes .../nbeat-black-hd/00_scroll_bar_handler_right.png | Bin 2877 -> 2877 bytes .../nbeat-black-hd/00_scroll_bar_handler_top.png | Bin 2865 -> 2859 bytes .../nbeat-hd/00_scroll_bar_handler_bottom.png | Bin 2867 -> 2869 bytes .../images/nbeat-hd/00_scroll_bar_handler_hor.png | Bin 2821 -> 2843 bytes .../images/nbeat-hd/00_scroll_bar_handler_left.png | Bin 2873 -> 2875 bytes .../nbeat-hd/00_scroll_bar_handler_middle.png | Bin 2839 -> 2868 bytes .../nbeat-hd/00_scroll_bar_handler_right.png | Bin 2877 -> 2879 bytes .../images/nbeat-hd/00_scroll_bar_handler_top.png | Bin 2865 -> 2865 bytes themes/inc/nbeat-black-hd-inc.edc | 8 +++ themes/inc/nbeat-black-inc.edc | 8 +++ themes/inc/nbeat-hd-inc.edc | 8 +++ themes/inc/nbeat-inc.edc | 8 +++ 17 files changed, 61 insertions(+), 38 deletions(-) diff --git a/themes/groups/scroller.edc b/themes/groups/scroller.edc index 474f606..cc0a002 100644 --- a/themes/groups/scroller.edc +++ b/themes/groups/scroller.edc @@ -73,8 +73,8 @@ group { name: "elm/scroller/base/default"; type: RECT; scale: 1; description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; + rel1.offset: 0 0; + rel2.offset: -1 -1; color: 255 255 255 0; } } @@ -85,8 +85,8 @@ group { name: "elm/scroller/base/default"; description { state: "default" 0.0; rel1.to: "bg"; rel2.to: "bg"; - rel1.offset: 2 2; - rel2.offset: -3 -3; + rel1.offset: 0 0; + rel2.offset: -1 -1; } } part { name: "elm.swallow.content"; @@ -96,8 +96,8 @@ group { name: "elm/scroller/base/default"; description { state: "default" 0.0; rel1.to: "bg"; rel2.to: "bg"; - rel1.offset: 2 2; - rel2.offset: -3 -3; + rel1.offset: 0 0; + rel2.offset: -1 -1; } } part { name: "conf_over"; @@ -168,16 +168,16 @@ group { name: "elm/scroller/base/default"; description { state: "default" 0.0; fixed: 1 1; visible: 0; - min: 10 17; + min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC; align: 1.0 0.0; rel1 { relative: 1.0 0.0; - offset: 0 2; + offset: 0 0; to_y: "elm.swallow.content"; to_x: "elm.swallow.content"; } rel2 { - relative: 1.0 0.0; + relative: 1.0 1.0; offset: -1 -1; to_y: "sb_hbar"; to_x: "elm.swallow.content"; @@ -195,7 +195,7 @@ group { name: "elm/scroller/base/default"; } description { state: "default" 0.0; fixed: 1 1; - min: 10 17; + min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC; max: 10 99999; rel1 { relative: 0.5 0.5; @@ -275,11 +275,11 @@ group { name: "elm/scroller/base/default"; description { state: "default" 0.0; fixed: 1 1; visible: 0; - min: 17 10; + min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC; align: 0.0 1.0; rel1 { relative: 0.0 1.0; - offset: 2 0; + offset: 0 0; to_x: "elm.swallow.content"; to_y: "elm.swallow.content"; } @@ -302,7 +302,7 @@ group { name: "elm/scroller/base/default"; } description { state: "default" 0.0; fixed: 1 1; - min: 17 10; + min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC; max: 99999 10; rel1 { relative: 0.5 0.5; @@ -600,8 +600,8 @@ group { name: "elm/scroller/base/handler"; type: RECT; scale: 1; description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; + rel1.offset: 0 0; + rel2.offset: -1 -1; color: 255 255 255 0; } } @@ -612,8 +612,8 @@ group { name: "elm/scroller/base/handler"; description { state: "default" 0.0; rel1.to: "bg"; rel2.to: "bg"; - rel1.offset: 2 2; - rel2.offset: -3 -3; + rel1.offset: 0 0; + rel2.offset: -1 -1; } } part { name: "elm.swallow.content"; @@ -623,8 +623,8 @@ group { name: "elm/scroller/base/handler"; description { state: "default" 0.0; rel1.to: "bg"; rel2.to: "bg"; - rel1.offset: 2 2; - rel2.offset: -3 -3; + rel1.offset: 0 0; + rel2.offset: -1 -1; } } part { name: "conf_over"; @@ -695,17 +695,17 @@ group { name: "elm/scroller/base/handler"; description { state: "default" 0.0; fixed: 1 1; visible: 0; - min: 30 130; + min: SCROLLER_HANDLER_SCROLLBAR_VBAR_MIN_SIZE_INC; align: 1.0 0.0; rel1 { relative: 1.0 0.0; - offset: 0 2; + offset: SCROLLER_HANDLER_SCROLLBAR_PADDING_INC SCROLLER_HANDLER_SCROLLBAR_PADDING_INC; to_y: "elm.swallow.content"; to_x: "elm.swallow.content"; } rel2 { relative: 1.0 1.0; - offset: -1 -1; + offset: (-SCROLLER_HANDLER_SCROLLBAR_PADDING_INC-1) (-SCROLLER_HANDLER_SCROLLBAR_PADDING_INC-1); to_y: "sb_hbar"; to_x: "elm.swallow.content"; } @@ -722,7 +722,7 @@ group { name: "elm/scroller/base/handler"; } description { state: "default" 0.0; fixed: 1 1; - min: 30 130; + min: SCROLLER_HANDLER_SCROLLBAR_VBAR_MIN_SIZE_INC; max: 30 99999; rel1 { relative: 0.5 0.5; @@ -747,8 +747,6 @@ group { name: "elm/scroller/base/handler"; rel2.relative: 1.0 0.0; rel2.to: "scrollbar_handler_image_middle"; visible: 1; - min: 30 57; - max: 30 392; image { normal: "00_scroll_bar_handler_top.png"; border: 5 5 5 0; @@ -767,8 +765,7 @@ group { name: "elm/scroller/base/handler"; rel2.relative: 0.5 0.5; rel2.to: "elm.dragable.vbar"; visible: 1; - min: 30 16; - max: 30 16; + min: SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC; image { normal: "00_scroll_bar_handler_middle.png"; border: 5 5 0 0; @@ -787,8 +784,6 @@ group { name: "elm/scroller/base/handler"; rel2.relative: 1.0 1.0; rel2.to: "elm.dragable.vbar"; visible: 1; - min: 30 57; - max: 30 392; image { normal: "00_scroll_bar_handler_bottom.png"; border: 5 5 0 5; @@ -857,17 +852,18 @@ group { name: "elm/scroller/base/handler"; description { state: "default" 0.0; fixed: 1 1; visible: 0; - min: 17 17; + min: SCROLLER_HANDLER_SCROLLBAR_HBAR_MIN_SIZE_INC; align: 0.0 1.0; rel1 { relative: 0.0 1.0; - offset: 2 0; + offset: SCROLLER_HANDLER_SCROLLBAR_PADDING_INC SCROLLER_HANDLER_SCROLLBAR_PADDING_INC; to_x: "elm.swallow.content"; to_y: "elm.swallow.content"; } rel2 { relative: 0.0 1.0; offset: -1 -1; + offset: (-SCROLLER_HANDLER_SCROLLBAR_PADDING_INC-1) (-SCROLLER_HANDLER_SCROLLBAR_PADDING_INC-1); to_x: "sb_vbar"; to_y: "elm.swallow.content"; } @@ -884,7 +880,7 @@ group { name: "elm/scroller/base/handler"; } description { state: "default" 0.0; fixed: 1 1; - min: 130 30; + min: SCROLLER_HANDLER_SCROLLBAR_HBAR_MIN_SIZE_INC; max: 99999 30; rel1 { relative: 0.5 0.5; @@ -909,8 +905,6 @@ group { name: "elm/scroller/base/handler"; rel2.relative: 0.0 1.0; rel2.to: "scrollbar_handler_image_hor"; visible: 1; - min: 57 30; - max: 392 30; image { normal: "00_scroll_bar_handler_left.png"; border: 5 0 5 5; @@ -929,8 +923,7 @@ group { name: "elm/scroller/base/handler"; rel2.relative: 0.5 0.5; rel2.to: "elm.dragable.hbar"; visible: 1; - min: 16 30; - max: 16 30; + min: SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC; image { normal: "00_scroll_bar_handler_hor.png"; border: 0 0 5 5; @@ -949,8 +942,6 @@ group { name: "elm/scroller/base/handler"; rel2.relative: 1.0 1.0; rel2.to: "elm.dragable.hbar"; visible: 1; - min: 57 30; - max: 392 30; image { normal: "00_scroll_bar_handler_right.png"; border: 0 5 5 5; diff --git a/themes/images/nbeat-black-hd/00_scroll_bar_handler_bottom.png b/themes/images/nbeat-black-hd/00_scroll_bar_handler_bottom.png index 14d9dec9754d29942ba7657be308182b70d73890..c2ad86dcd0534ce1b16368ccfc6cd6a81a3c71a1 100644 GIT binary patch delta 168 zcmdliwo**7Gr-TCmrII^fq{Y7)59eQNE-k#I|mz(^s7BLX`^B{SM6<1SvFPCS#KX7 z1d2v`x;TbdoW6QtpP_ip^39wE(MBP`t4_KAI2PX}x9;RZ{kX*gTe~DWM4fSKvQ# delta 179 zcmZ1}wpmQEGr-TCmrII^fq{Y7)59eQNXr2+I|mz(lz;j6<3`19uKHWt%5&`%F3uIP51zH0tw?XZ#BJ8{I|a5DzmpCs dFRg5nt*VzXUfQU74rn0*ho`Hb%Q~loCIG)LKSTfk diff --git a/themes/images/nbeat-black-hd/00_scroll_bar_handler_hor.png b/themes/images/nbeat-black-hd/00_scroll_bar_handler_hor.png index a7d1e15fe6518d7b18c0f832e5e6ad63acdca8f6..0518b77004b39ecd34d28f6b04c4998d6060953f 100644 GIT binary patch delta 177 zcmbOuK0{2gGr-TCmrII^fq{Y7)59eQNJ{~+0S6n9bv!h7c z#m{b`0xFCwiP8!lpTmwx8QkT`)Z)ll%*8QDfn!l~f=CmK&?W7E{=E`~Md^3uR=sz7 zzT*HV-`nNkHV+x2XRv+X+8kAX_tCoEle$;4k3~wihY8#;Fqc_*yYTQLgMyEbFRu$T zKYjnt`Tslai|8LP+r#x90|PLGJYD@<);T3K0RY+xb*2CS diff --git a/themes/images/nbeat-black-hd/00_scroll_bar_handler_left.png b/themes/images/nbeat-black-hd/00_scroll_bar_handler_left.png index 273645e2c7244736b64d0b45968e8cfb4fb8fd59..a5ecd52afa8d33860002418d6ddace12bbe470de 100644 GIT binary patch delta 156 zcmV;N0Av5T7O@tP7YZ;41^@s6-7R3ou_22Jf7=Ni1}6~Mv31M<003i2L_t(I%k9*$ z4Z<)KMbYzJQACtTp<<1sKoNr@MoG;CR5*>R$gwhjZ+rCG7fLzj2PTZTLKJx7WmhVT zMWs|0=?HHQO1QL8$BrF4p2c4azb$;@U&V-6@u^|#E_KEo18mT<6VA zIYtwOa)deDn<-#hLklkWAD=aR)bNVe6s}UrImYgd{s$qYe2=laVTTRY@Budw5ZH@y S4sinj0000Gr-TCmrII^fq{Y7)59eQNE-mL6bBoS{Ahar`bNcWuKL@YvTSOSJIelO z0!5QNT^vIq4!^y&k+;EshxHRg# delta 150 zcmdlWHeF1yGr-TCmrII^fq{Y7)59eQNXr4S00$e8WVAYeX`^B{SN1J#W_A;)NMUi1 zoTsOYV~EA+>(B}IS} zTjyo1?W?3QuwQ4pNnrrG6av&ata3=ff&~j6#W{!16n=m{g@dH{|C(=L0&eT2egSp3 W5*V!fronXp0000w!b*7i%6RiHt0$S>l!X=XvP`;|aE$a^?Iz~$i1;D(6{mu}c1m=vjJqi`hGMe$+g1D`spJnscuG(jLD*Z5Xr|rfU*`7YV{5~sp3ZH8d V@lXC1e;8;HgQu&X%Q~loCIIw>L0bR- delta 177 zcmZ22woy#6Gr-TCmrII^fq{Y7)59eQNXr2+I|mz(lz;j6<3`19uKHWt%)gG}60^*ie%@jA z%bUo1_;H_l-VTdx^7|sP@7e_j$r@%}-hC}sv+|ddNz?xs%Kp&{FU?}w`z@CFE@y$b bUlzNyCx3i|&Ua3rbqt=aY<@25oD!M*1%>}$ERB>g&Z#_V#J~V_ou{jx%Q~loCIImQMneDq delta 179 zcmdlgwpmQEGr-TCmrII^fq{Y7)59eQNXr2+I|mz(lz;j6<3`19uKHWt%5&`%F3uIP51zH0tw?XZ#BJ8{I|a5DzmpCs dFRg5nt*VzXUfQU74rn0*ho`Hb%Q~loCIH8iKTrSw diff --git a/themes/images/nbeat-hd/00_scroll_bar_handler_hor.png b/themes/images/nbeat-hd/00_scroll_bar_handler_hor.png index fa21ac30e1cf4a3aaab785b9a3dec2b16f73fb2e..859f7cfaacd2fc41b51141a66bc12b59829bb155 100644 GIT binary patch delta 154 zcmZn_n=Pi;8Q|y6%O%Cdz`(%k>ERLtq@{q^fP)Q4^4Dg~+o;&hm4BO4mQCI|d6Gdn zP}JAc#W5t}@Y@?3IT;jr90E&)XP=hpd&VJV{$Xu_220EL*Dc{oynA14R=MI8w19g- zNBWwtefzn0f6ilJYIIN#-~dqz4zD`TsUiD|L0~nPDd#2bV4%Sap00i_>zopr08f)K AB>(^b delta 132 zcmbO&)+(mh8Q|y6%O%Cdz`(%k>ERLtqy>Ojj)M(Is{WiOxKXj2EAkdMGrN{lZ;-}8 zps2a0i(`nz>Ew{`@SKDN3&rNJ?o f;c>>xM$H-2xN3pmrU9Q50Jk;ey22!!vRO^v4yU{2^U|5 za-2;R$`R&pXQqI44K-}ou;IV>tl^`ESG=Zhky6ev_HPV72r1=zjQtH8tgwU+6C4oy U5QA3_NdN!<07*qoM6N<$g6)|=MF0Q* delta 164 zcmV;V09*gN7P%IX7YZH-1^@s6;EM!+u_22Jf7%NJ2P+1ENJY;8003)AL_t(2&+W@G z3c@e|K+)F-Dh`E05Zvt4Gq_0c;GRWSA&}8YT{3AKFVMd}exo!D{ShY|&_Yw-jEk>A zIYtwOa)deDn<-#hLklkWAD=aR)bNVe6s}UrImYgd{s$qYe2=laVTTRY@Budw5ZH@y S4sinj0000_Gr-TCmrII^fq{Y7)59eQNE-mL6bBoS{Ahar`bNcWuKL@YvTQQa#TT7x zfTC%hE{-7)hm%9X!*dc2FkQKNRYrnMa7X3mYm7OMbat4eq&?$R`)({E@+3ht{fH>D zGpm6iPocr9#z6j_s)Q@di{&J4${n~lMIx8GcU!BQ@y8YHZniM#ExIPR#1>UXb1-as XC$?5@O9%_lMotD#S3j3^P6xx0041GL_t(I%k9*m z4FW+FMbX0sfkLB5M*SvGTM4C589_k}qjnXb2?{|Fgs>r*2?flR@Ax;1NIUOtxZsrY zFhb|s5`k?*+Wg|QJ|eA4*r6{WtZKNZp@t0`HvAVKHN2MaiG2wVIS=D}GTd>-@pGv! Y6fL+HwYMys$N&HU07*qoM6N<$f_w!;CjbBd delta 168 zcmV;Z09XIN7QGgb7YZH-1^@s6;EM!+u_22Jf7%NJ2P-4XOp%BH003`EL_t(2&+XG8 z4#GebMbSf3fkLB5M*U5ox)PSc$_R?CVN|OCO;8AeAcTfwh7I(}cl29Cq`h}HT+rt{ zjL`VDLSPq>w!b*7i%6RiHt0$S>l!X=XvP`;>X6QEAir)D? zYm3fxN%I(kU;gnmA71^fa6bLRI&5psUis?N&*eLknEh;&=dTyjpMCwnl69H}B60>T bkLoJ@_~RLN%lrje$KdJ8=I64`DWM4f;Fmn@ delta 177 zcmdlewoy#6Gr-TCmrII^fq{Y7)59eQNXr2+I|mz(lz;j6<3`19uKHWt%)gG}60^*ie%@jA z%bUo1_;H_l-VTdx^7|sP@7e_j$r@%}-hC}sv+|ddNz?xs%Kp&{FU?}w`z@CFE@y$b bUlzNyCx3i|&Ua3rbqt=aY<@25oD!M