From cf1875c10f8ad0fc4a44a44a18c91a4e7b95d51c Mon Sep 17 00:00:00 2001
From: prachi kumar <prachi.kumar@samsung.com>
Date: Tue, 30 Jul 2019 21:48:16 +0530
Subject: [PATCH] ALL PAGES Landscape Mode, Home/Apps/Menu Buttons

This patch modifies ALL PAGES in landscape mode and home/apps/menu buttons.

Change-Id: Ia96a9e80e4eb1c78ac3d6bd61142cdb67abac110
Signed-off-by: prachi kumar <prachi.kumar@samsung.com>
---
 inc/conf.h                             |  14 ++++++++------
 res/edje/cluster_allpage_thumbnail.edc |  33 +++++++++++++++++++--------------
 res/edje/home_btn.edc                  |  24 ++++++++++++------------
 res/images/home_button_apps.png        | Bin 1110 -> 579 bytes
 res/images/home_button_bg.png          | Bin 1753 -> 932 bytes
 res/images/home_button_home.png        | Bin 1376 -> 540 bytes
 res/images/home_button_menu.png        | Bin 1196 -> 421 bytes
 src/cluster_view.c                     |  28 +++++++++++++++++-----------
 8 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/inc/conf.h b/inc/conf.h
index f9328f7..a0304db 100755
--- a/inc/conf.h
+++ b/inc/conf.h
@@ -98,12 +98,14 @@ extern int __conf_get_cluster_all_page_w();
 #define CLUSTER_VIEW_H_COMMON ((1280) * (__conf_get_resolution_scale_h()))
 #define CLUSTER_W ((708) * (__conf_get_resolution_scale_w()))
 #define CLUSTER_H CLUSTER_W
-#define CLUSTER_ALL_PAGE_W (__conf_get_cluster_all_page_w())
-#define CLUSTER_ALL_PAGE_H CLUSTER_ALL_PAGE_W
-#define CLUSTER_ALL_PAGE_GAP_H ((100) * (__conf_get_resolution_scale_h()))
-#define CLUSTER_ALL_PAGE_GAP_W ((16) * (__conf_get_resolution_scale_w()))
-#define CLUSTER_ALL_PAGE_PADDING_SIDE ((32) * (__conf_get_resolution_scale_w()))
-#define CLUSTER_ALL_PAGE_PADDING_TOP ((60) * (__conf_get_resolution_scale_h()))
+
+#define CLUSTER_ALL_PAGE_W 357
+#define CLUSTER_ALL_PAGE_H 256
+#define CLUSTER_ALL_PAGE_GAP_H 16
+#define CLUSTER_ALL_PAGE_GAP_W 16
+#define CLUSTER_ALL_PAGE_PADDING_SIDE 88
+#define CLUSTER_ALL_PAGE_PADDING_TOP 96
+
 #define CLUSTER_DELETE_BUTTON_W ((60) * (__conf_get_resolution_scale_w()))
 #define CLUSTER_DELETE_BUTTON_H CLUSTER_DELETE_BUTTON_W
 #define CLUSTER_EDIT_LEFT_SCROLL_REGION ((72) * (__conf_get_resolution_scale_w()))
diff --git a/res/edje/cluster_allpage_thumbnail.edc b/res/edje/cluster_allpage_thumbnail.edc
index 9d8deaf..3adce11 100755
--- a/res/edje/cluster_allpage_thumbnail.edc
+++ b/res/edje/cluster_allpage_thumbnail.edc
@@ -39,15 +39,14 @@ collections {
 					state: "hide" 0.0;
 					inherit: "default" 0.0;
 					color: 0 0 0 0;
-					visible: 0;
 				}
 			}
 			part { name: CLUSTER_ALLPAGE_ADD_BUTTON;
 				type: IMAGE;
 				description {
 					state: "default" 0.0;
-					rel1{relative: 0.375 0.375; to: "bg";}
-					rel2{relative: 0.625 0.625; to: "bg";}
+					rel1{relative: 0.442 0.421; to: "bg";}
+					rel2{relative: 0.554 0.578; to: "bg";}
 					visible: 0;
 					aspect: 1.0 1.0;
 					aspect_preference: BOTH;
@@ -118,8 +117,8 @@ collections {
 				type: IMAGE;
 				description {
 					state: "default" 0.0;
-					rel1{relative: 0.031 0.031; to: CLUSTER_ALLPAGE_THUMBNAIL_IMAGE;}
-					rel2{relative: 0.218 0.218; to: CLUSTER_ALLPAGE_THUMBNAIL_IMAGE;}
+					rel1{relative: 0.028 0.035; to: CLUSTER_ALLPAGE_THUMBNAIL_IMAGE;}
+					rel2{relative: 0.140 0.191; to: CLUSTER_ALLPAGE_THUMBNAIL_IMAGE;}
 					color: 255 255 255 0;
 					visible: 0;
 					aspect: 1.0 1.0;
@@ -199,25 +198,31 @@ collections {
 				name: "add_button_mouse_up";
 				signal: "mouse,up,1";
 				source: "cluster_allpage_add_button_touch_rect";
-				action: STATE_SET "show" 0.0;
-				target: CLUSTER_ALLPAGE_ADD_BUTTON;
+				script{
+					set_state(PART:CLUSTER_ALLPAGE_ADD_BUTTON, "show", 0.0);
+					set_state(PART:"bg", "hide", 0.0);
+				}
 			}
 			program {
 				name: "add_button_show";
 				signal: SIGNAL_ALLPAGE_ADD_BUTTON_SHOW;
 				source: SIGNAL_SOURCE;
-				action: STATE_SET "show" 0.0;
-				target: CLUSTER_ALLPAGE_ADD_BUTTON;
-				target: "cluster_allpage_add_button_touch_rect";
+				script{
+					set_state(PART:CLUSTER_ALLPAGE_ADD_BUTTON, "show", 0.0);
+					set_state(PART:"cluster_allpage_add_button_touch_rect", "show", 0.0);
+					set_state(PART:"bg", "hide", 0.0);
+				}
 				transition: DECELERATE ANIMATION_RESIZE_TIME;
 			}
 			program {
 				name: "add_button_hide";
 				signal: SIGNAL_ALLPAGE_ADD_BUTTON_HIDE;
 				source: SIGNAL_SOURCE;
-				action: STATE_SET "default" 0.0;
-				target: CLUSTER_ALLPAGE_ADD_BUTTON;
-				target: "cluster_allpage_add_button_touch_rect";
+				script{
+					set_state(PART:CLUSTER_ALLPAGE_ADD_BUTTON, "default", 0.0);
+					set_state(PART:"cluster_allpage_add_button_touch_rect", "default", 0.0);
+					set_state(PART:"bg", "hide", 0.0);
+				}
 				transition: DECELERATE ANIMATION_RESIZE_TIME;
 			}
 			program {
@@ -236,4 +241,4 @@ collections {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/res/edje/home_btn.edc b/res/edje/home_btn.edc
index 3c6cd64..0b5a58c 100755
--- a/res/edje/home_btn.edc
+++ b/res/edje/home_btn.edc
@@ -30,9 +30,9 @@ collections {
 				type: IMAGE;
 				description { state: "default" 0.0;
 					align: 0 0;
-					rel1{relative: 0.044 0.928;}
-					rel2{relative: 0.223 0.986;}
-					color: 0 0 0 40;
+					rel1{relative: 0.018 0.922;}
+					rel2{relative: 0.082 0.988;}
+					color: 0 0 0 102;
 					visible: 1;
 					image {
 						normal: "home_button_bg.png";
@@ -60,8 +60,8 @@ collections {
 				mouse_events: 0;
 				description { state: "default" 0.0;
 					align: 0 0;
-					rel1{relative: 0.27 0.1; to:MENU_BUTTON;}
-					rel2{relative: 0.73 0.9; to:MENU_BUTTON;}
+					rel1{relative: 0.317 0.312; to:MENU_BUTTON;}
+					rel2{relative: 0.682 0.687; to:MENU_BUTTON;}
 					color: 255 255 255 255;
 					visible: 1;
 					image {
@@ -83,9 +83,9 @@ collections {
 				type: IMAGE;
 				description {state: "default" 0.0;
 					align: 0 0;
-					rel1{relative: 0.776 0.928;}
-					rel2{relative: 0.955 0.986;}
-					color: 0 0 0 40;
+					rel1{relative: 0.917 0.922;}
+					rel2{relative: 0.981 0.988;}
+					color: 0 0 0 102;
 					visible: 1;
 					image {
 						normal: "home_button_bg.png";
@@ -113,8 +113,8 @@ collections {
 				mouse_events: 0;
 				description { state: "default" 0.0;
 					align: 0 0;
-					rel1{relative: 0.27 0.1; to:HOME_BUTTON;}
-					rel2{relative: 0.73 0.9; to:HOME_BUTTON;}
+					rel1{relative: 0.341 0.229; to:HOME_BUTTON;}
+					rel2{relative: 0.646 0.75; to:HOME_BUTTON;}
 					color: 255 255 255 0;
 					visible: 1;
 					image {
@@ -136,8 +136,8 @@ collections {
 				mouse_events: 0;
 				description { state: "default" 0.0;
 					align: 0 0;
-					rel1{relative: 0.27 0.1; to:HOME_BUTTON;}
-					rel2{relative: 0.73 0.9; to:HOME_BUTTON;}
+					rel1{relative: 0.341 0.229; to:HOME_BUTTON;}
+					rel2{relative: 0.646 0.75; to:HOME_BUTTON;}
 					color: 255 255 255 255;
 					visible: 1;
 					image {
diff --git a/res/images/home_button_apps.png b/res/images/home_button_apps.png
index 968b1b2a3be6c448cb2e6a5f61ce54b03fb210f8..377bdac5eea4fca541a6bda7ae9180ba510a1078 100755
GIT binary patch
literal 579
zcmV-J0=)f+P)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N4000McNliru;|CKD1UGvH
zz}o--0hCEZK~zY`?bSVN6+sln@!!1}W2e}Ng+WL!egbQ;5gSp#DurUwE39wbq8}hp
z5wr=ur3qRH`4;g51Pc)qEX2x<yK8YL+;Nz|il9M!V2k<loH;XRX3mb9ra6gArs{DQ
z@BFM2Sj^Z;UDul_sH$on*Dy-(YQRNY&L-Hz{fwP2_&!H(s#Ca<v36{@Mgv(<zmn*;
zG)7n8ZGkldSt+&)xQDlyajjrp!F$tkb$DIyJ&$wDB<#(oX-bP4uDY%Vm+p_~-%Av5
z+~m>jByF&akC}HK3o!=1<1w~UQ&m+*OghMHL>-<6T#a9<4|tHV1>7hs_GUIdi(45x
zxLfH;FMehqD|V2-ei`}#YX`DYY#&U{;!CpSZLAl}Poih1Ty12z)^XJI()4)tzccLp
zL;-U+ov;=!@ip@v#+hVs9bVy6YO1R00M5yN69Lz;RM_dGj4k1I#^!J*V;Ar+W6R@R
z$`=Z3b|5Qti}9Yk4E;b>R4_UCL&=uEVWZ$(!!hiO<LwxmYXhs;AIB|T`~bk#Tvwim
Rp%(xE002ovPDHLkV1jFJ?PmZ0

literal 1110
zcmbVLO=#0#7*3T9sSZ30VRK-XUFNX)X`6J7t6Q6-ThY$0E3U91X35tzTazy)-%K|=
zs5rrkyG(ZSXYAlX7~&5I4irRW7x65@?lSNqs0_g`T{}ID35MkR%lkaf`@Y}%-p&mV
zwglUQ1VOZ9hU7e+d;ITEGalc)-5AGH8&ZmB6qb;uI)F&(a1xLiQ=I~Npz3p%H$Wdj
z94r}yA}VIji5fI%)wiLmrj5}A(br$KRc!_!auQ4#R)YHa>NQ0gdV(6`vuxIuK-n0Y
zcfjcUa6y}&(c(JQe}?R<ikQFzNF}Rg#d5`Jf~xU~c<moE6j?JtGYM+PsbV%qO3(o$
zPe(!;%W<S2&|H)k1nv|WX1OrK;#UZ9QIQwKaEz=!6jpQel9-p%buGM0P-TQ{kzqW~
zqrC_XohgQk$KyUnI2^(jA$QI~YBglJT@3~qxSC_w$bc5<Gpdtt79}X`=}riyoz3nN
zTW&p3IAu&#wHc0P8PoLRs#&`z5B|8Zr?p#{vjLL_E}V5Vd>^H*1{mjVe<9xxdn2BA
z416hSMTXj}2`rS66BPbK>xM2$N<`=tQhYSbu?o*|sa`25OGzb;lZuB_gJUnOAPF&6
z;ZhvS3mm8L@d%%mQqfo>!t$wfJlw!$EElPk1{%5s)~#cc`(j1O0V;w{0m4e70&-=D
zpj(DEDUAwb_n2Yn&~s1v*RvC?3>@PM(9;ey$y$CzV-J0q{a4&OSp9!;#$aa{zc~IX
zmc|jTK!3Sg`gpV3Jix*o<KWilm@7=+wz`#(lZEQ1t-B+^Yvj?U7u%am<Xg}9gOw5b
z=Huw$?auYZz=_ir<<Cc+z05S{1_Djb@1wN|p-sOBdw+O=&G^~D?7;VBZ?Q5u_;Y?B
z@auS)E-be^?OwVw-P%6V?X~6x-V-egUoI%Z)g@&G6;?k!qLl?JrW{*15bS=q`l0g;
XvHoOi>-uuXwBP9&WmsNIUAplb+TvdD

diff --git a/res/images/home_button_bg.png b/res/images/home_button_bg.png
index a5055799a34ab8d00a31207f922a4b85f7e88a9a..ec59e87744697f7e759f032d9b69ea70ddf3a18c 100755
GIT binary patch
literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq002?|001xu1^@s6f)Fjr00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N4000McNliru;|CKD1UGvH
zz}o--0`*BmK~!ko?c2?68&wp*@m~f5R-=+oC`g4B{S>MSZPg7(P$}#YFTk_R%dq4L
z_z)nfvTA4r2m;wwqNPoMw1hTsyExN04z@Gn30#kvzcdTmGvnjG?)BV{bLJcjhj0up
zVG)PX#nZ?R=sW7t!$WN1Ppsn>ZsPu=H_h`LbZP|F#c3SJi>WP@Aj7l8v4B^1eRc<{
z_z8baa`Q<<&f^W7neh5)<b~q6h@Wu{8&z&lMMQ>kxKQ!BCh?SLASbYl>*6nAU&;zu
z#CtfB`j`GkbZ|)s{akeYv6OibyoL|_e<beadAwgZ7|VVw@+{s;{c94_!IBu6d^hT(
zaV@fy*k?|-czx6fqeLFpN*u=9Ms)LGA{X&a>WHV5Ib0Tw2FQlIUJ^5smf>{72xh?D
zUXka-z_evNM}(^#c8i?H`P30Mhzr6Q21TCNcIhf~#8er5kzJfh9a#f8ljnJtzQ~hi
zcmDiu(h<|h9g!zeN7P_W662ySK1>}=!}%z~E2*QH0gh#2d!VHrM>DbP-cpZ+R^-93
zkco#)OFa%f*;#9;M`v30oSRNB!-LdO%m5EFk$KQkkH0gKzR^;TjSOq4qnH8KGW?o4
ziW%T`CbF?w>Txp@*;ltyN77(^%kzBW$vAQ~bu<lTh5o|s3bs;5)IhfI3w@EB3bQSh
z_%YA(O$K)nm$j|33R@z75`!Y|iA>d&ax4pH_-CfY4ctu~VFOqbu6EcfvWHK#U3?r{
z_ypU#-yF7#wvI3HD0ReB%2&eC0Hf9;S8*kE#8b!>#c*dY;}&**z&EKQpCYc}`%xe6
zm!@(<Jel4taqg_LjW6so`zs@7Rs1I`8Iq|w<E-N|CCWp}wz50;SfsJNS>d{-(i6S$
znvx@!Dnho48?OkNr$wdIEYZ_1p{ulWFiFeWz}Ll>of4UBO)qA;t6$VPQKf91E_xr|
z7RS6OGk#fQZajx)ieoOdrGiId$MgaI!0-BH#+3><hw&KLTz}E8Z#C2a0000<MNUMn
GLSTY&x1k>Z

literal 1753
zcmaJ?do)ye9G|jMTFWWQBir5aIKn*cFw@M<B<7k-8fkFoL}tuf3})__xiTYdL~UM0
zsccCvB|0mU9$TwI?bfm=*|tK9yo#{mh_gp~M`-_8d(XZ1_c))==llKszMp$;x}Wbx
zBST9=0)b$}^M(cZ7=k~H#f$LwrsOFJK3HI0!I(c9fhCBP2*E>wh9dw^CW=G^h)AM|
z`xS8`5cG)BfM6_`zZnvvGO|dAA**EyoJ}COxvLc-aSVb1;Yg%Z&L$51bdLx~C2V34
zoloT}I7pP#J5h=FC;A466Jx|I3DJE$;HHLf0U3gc0JSVuu7cET;<PS=&vn}rA}|fX
zV%Wq_Nd@!$01m1|06N))B&LEOz+jL;S2}|MIs-H+NTX2kn?V9yAvy!1tp#Q-A|6dC
ziGTz!cP19TViTh<OaW0S2?+`01Q#-@jHG}p7E7l=qmgg~Nu`lvA~i{_vYAzY5tUde
zRbWz74(Jp`;b=U@CgPcXDnX{0la;GxjtM_7idv+gfMlw!q*)-J|Nl^#Y!0o$1jy%n
z|5I2Mpiv+c0ir_Vm14Yc5jMI|3W%dbL>Q_JK+)LQQ}l~MF;o?WDgcf@18@kE$|Y!m
zYRxpB&xd$&6(*945gyDY;tFJ`R01(sbkKtXb3iJc34&g9CI|Fnf;0{cGnq6l*JYLq
zqvCiOBFARAlFwXtUarmxG6fzPMwHT>h=i*|Wx#aFkaYfBJm%G#;Y#Mu#dBUR1y6>e
zYwW)oJ-dawM>n0bExwpDJ|f56uEcHaxU~|(zZO0Z_6ShF94L@QWsA%o4!tH7nLL9n
zqe(*<j1?mu8G<A+se)wW)p_J--W6iE9eSZB)z45f;fQo!aHd#1TjpbW<R-GN_e0pO
z!QxXcz3*6!yZ`iU_!xH2czX+LtmRJst;YAQf0(5|d|fNtzjvQd|I*{UlsI9Q<3N%@
zTf4Pd|7BI^@M4&MhxZ^^ky~jQyD;W@>&G==)uhJ@2h)zO=6;AOHyc>s9~jrgW`60L
zvbrqIctLhM;IQ@Q@3#ounMUD^eT|EHH(Us}HQvBhM|0HH%rc)PE;*-#226C*k0GXq
zQtWTn=PwsV-pGt*bl6mRl^3p8)tdR~ecNl}cJ8Jpebn6Hc=a!s6Z?o_V&x0&9!<CH
z^RHpG9@7Us+f+2(zinSo-=T`u?6f*c`C_+5+mQ9mt$IFvb>4%i(I#6=3-S|d8J2Ok
z?Ai=hFM+BgiL?{O!u@2B=Tv#{>JLQ$K?jS>$ek_Kn<ur0ZwjFU6HZAM$o6{Ia+<cN
zxhZ|DdD71A+|pf3P6gLT#yQvYIu1=(i`|b31jnAHRs>`YvqsyU-@|Gao9T0_dHAb4
z8zlq9{%Lg`$F*2TL@}}E{M(_E!C9w91s~i^8V+}o!_-f(q$hcTCZ2IalU+?%Q)<Pv
z%;88}MOLZlW&}>XdvQoe-2J@mY%)(E=(1>upDZst3B29YE<J19pUctmjB~?O?sC$I
z$+kj^@d>Apm-b&h$-I7`<?aJBvW5ODheAGR{URr?#MB_A%c_1<>{fqwpxUYOV@$Vo
zPspY%+@{jX`vqF8#;&4@6B?fX_fx$Ump!cIC4;GTnx3{%GiX;}#!k;01<!fy$CjsG
zTe@SRRUgH#Od6STvedST;Sjp5zYi=934E3FT_NV4<0BqWgzm6><05Y8TehkcWPmhQ
z=cN(IF2Aeo5xLt4dUWE<eWM<yE5%6**yFw0k=s^<U6V^EvWCnrRu+!z7JBAp96SHe
z04p(aEw}$I+0vrKw*EBj%*AWoa2;#XCb4Clbb2Kf+{+`EUapEL=bBB$UOtoi*Q&Ku
z`U<Pj{Tl6oj&H<Qv-4g(aHLZuu^Ce~Srmn~E%EoADJyH&)juwM1CH76`NEtqzDjRw
T^bv1Z_p{-7`NCzM!oB|hYg@U!

diff --git a/res/images/home_button_home.png b/res/images/home_button_home.png
index ec4cdcc3cedca84dfe77aaef8cb686845027b204..8ceaa5a08e7665b8df60a4e9a9f37c6778253ecf 100755
GIT binary patch
literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N4000McNliru;|CKDE(%Nr
zK;i%Z0c}Y{K~zY`?bW|(6hRyZ@XuzC3%TGc_#6s}35pW@S4c<@R76N@Y}3pGY-M9>
zXEa7oqL^r9r()%U_y86TN>XGNkK^u~$(@DZ7ZzrQ`OSwJc4w;?qk^2md;G!`d~cd2
zt8k_Ona4XUU@5hGxy89qFD<;-H@1YgA%rX}2kK!zEj*YDcpXBRn-rSE8=N0A=Mwfp
z2(u@JX0eBh8M|IdShp1FCS)Z8X>%DbM`6RDE?%X=(p<;xFl-R&Vi(s=fV8=Roe)Aj
z3hH1dO`J5Vc;1h-P@Ry~DIjguu-#%+jIqX3+?*oPpKaXh;PGEX;0}JwIKI2!Fr(-*
z?qU<4GUm5yE>tnb(>TBrJRDQ>1?TWH^=o{<@|c<}+``pr;5RXDSGVzOU~C;PMin$o
zQ?>1q-^5|&*wB<f57Ke9sc}EIxKjX~!ACrDeBo~R{US{jg0tx<PRY?tl>gAb2YprW
e5&j|H`a4JUBuw@`D7O*-0000<MNUMnLSTaNIoBcp

literal 1376
zcmeAS@N?(olHy`uVBq!ia0vp^S|H591|*LjJ{b+9BuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFsEgPM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWv2L<~p`n7AnVzAE
zshOFfj)IYap^?4;5Si&3npl~dSs9rtK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1oI$P6PRU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr>
zm4GgVcp<mI*B5SZUNJPFfI+5TkyxN_sAr&`n+x(6SaoqpP%6S1SXCE?R2HP_2c;J0
zmlh=h<0DNOrWqJ^_$>k{1iHq`zbF$JDTz5Q`N^fZsd*)yF1AWQ8NHOu6f0*}V>1gg
zCsPw6LjzY+LqjJEXGa%jM^{T=paKaem>JmgnmD?+I2#&S7#f(G85+8pI+<7+IGY+d
zx|ldRI~%yU!1Q|N6_+IDC8xsd%>>#D)oYGdua$FAYGO%#QAmD%4lD%(WaO9R7iZ)b
zC^!e3DQJXe=B4D97i)r|2jW|o)S}F?)D*X({9FZa_*!LRvERjjkiQ{%Q^*N3eV}9X
zL5Tw?vA~3YDG<bjCw(9Xo_SL9fH|fJm^BJEo(N`OV4UFT;uunK>&=YQUWXk-+JqfN
zL|IvvzVN!UE6_YnBX-KF6u}Qp;!WQ22V1Q_GS)B()^NDS><lw!jbF$eD4_X>RrMcx
zx<bdyb4$`Mu{>+<UzYgn%<)WX&sXk&Pec`M;~XEk%v~XTcH;}Zj7F>M&|B`3HyPtE
z=D#SNz1nPfimjUFXHK)vD!ab+FFC``@mXP)qSbP)lWccIcw1ZiGVWBFyD&3*&NSaJ
zYw3$9F3*|a0cV}Is99b1^w^dZyhTgwA;(qC+X8D1yiRR7&~@(DuIU$yEZCXPOuwxd
zSibVEL;T~w6v>#bMcY0xWj#=P>w8jZ#|9lwNyhL5#a#FK2WC86^nL-Sn&bY5F|*94
zE?c~O<74LD)^i6~W-vZ};F5eU_E6Qa`xk33MrtjRy2J4K!Eb-%yn}O+;`DDY*FKo>
zx-Mku;ug#H+-H?@Zcp}W6F$dZB=Vj2zh)qB9mD1ahGlsocbX@iQhc4R_De9fS-_{+
zVUPaPwToBE-g&%9xO9=<mg0+SpMRa-_AT)HMe9KIsFI8FjBE_A+|^FazrHaMROWfQ
L`njxgN@xNAfu7}$

diff --git a/res/images/home_button_menu.png b/res/images/home_button_menu.png
index 75eed428377ae16088179ad999586dee3a644e61..6bcd294b44bc1eb150b041b54e1dce8ffaf7c878 100755
GIT binary patch
literal 421
zcmeAS@N?(olHy`uVBq!ia0vp^3P3E(!3HEhPT~I!q*&4&eH|GXHuiJ>Nn{1`6_P!I
zd>I(3)EF2VS{N990fib~Fff!FFfhDIU|_JC!N4G1FlSew4N!tD$=lrpNCUx7=iT){
zinG8YvY3H^TL^?1FWs&C0~BO0@$_|Nf6Ok-&tma<*Ih55&^J#P#}JR>Z?CQQYH<`{
z{c!)gyH1$k5jC^P{TsyYA9%7qVMFdmMV>I%2$#usHC}LYsIB(o`KH^qPD;j6tjzw$
zu}B^{iL`fj9?mP)Gxrg6YG7WIcq~Prpfyj>X~yx(EgkI}0~Y@)ENpK-v!pws^Z6<{
zuWto&A`i&*?Q1qNj#U1~dWH9A?3=||k@XGEbGC?X=w0eEdA26gt{a|j4&2<q?#q<-
z_*9#{eT(We!>gPAX}|k;FYJKkHX+}6zoni{<U5{dHgV5Jw_x^b7Y~+re-gj5gyY5I
zPvW}_gi=*1yFVuTZR&Wwga3m5qy7xh;vEOv(-=j~7TtX9A9zS-O?=4g55N#$@O1Ta
JS?83{1OSTFp%DN8

literal 1196
zcmbVMZD`bH9FG%plpZLah*Bh`AJ&SOmur*WWxdwBOR86TwO$Ww8A8+Kxx3INPnJC0
zrFD!UzF^fVQmhK%8&(t)5&hy|tF<cX2Vu+&w2UF>icW-Wokc9{$+cJgP!tTw^ZNh&
z{_ok-(!9Y}vZ{n22w!5Ol*02`@B4fa9&g>e`xTy6BDoE<!VJnQHXx!J>;z=OP_iHe
z6s`B`yP%dJ7H0Hx8){27i7GT`#gn03!@_8SsI7M`MePEJ>;zfej8LzB_=zHQEkbSK
zlWfw8gPgvx&jzi1&1to-OATvOeH~frikQFvNFiOL+jK-XLKS#Ly!MV6iY$nrt_U?_
zR9muzj6)lcJY5w~S&kzGf##}tLEzSrL6!?LEPjOmS1s~_7_1>@9|~);wTzgO8fJCj
zU4+UZWQh!u&*$lU6%Fky!-d0Pk0TfiV2Oa!Ya+!Bm`-_-K?06y>lV_XNqUS*C+tBH
z3R^nkf?*|-bHt`I8z>wy##Jnaqglo<JiiLk4oZP{X3Q(?q<byEq<{l^Y!&AtQ(gq)
z*nL=$Cy1>PH`zK)iqb7XwZ{M^N=Ok3-_V+_iE+6~2njL1I>@my&vCI(JSxSbau^2{
z53wT0eArls3ksp2#Id}<aWWrm2*;#qArxlALQNGf7qJP`L5it@qFx>AoyEpKh!x{D
zP!P1!5Ox<Upd|+pbaK!l<E;W&u|+pEn0G3@^vrlG0bBnDXbm<r$U=NYeIET1`!T;~
zu-d1@jKRh*UU9rvEX5;Sf!=bi^zmk{d4P#K#>TC&dDMK2+iE-^Mbqx1zYZr$M%g7h
zzkJeo;E!m3)<1T<!rg01{-NJ*@2~H8IQ3b3#nrLUq2Ygh-|mh5{9V&O!^_pCUw1tR
zfy(~W;A#Ka+-`Y8$Kur^((O9uMOj_r+8-wuAFLT)|APH*&+y+v)T<TK2X8IC$4>fR
z9-1f}>~C+szHP^T;(>diae8Ixpzr$kr@ojx{c>Wo=jm@(w*AS8tGWhCT2CCC@Q)9k
zKQR_MbMDyKu3xTY?6;HqE{$wmqraw)zVY9@x?s~~IFj`ZoSb_0&>1M0QXyA9zc@rJ
YB<|lpQ%A~{-SPe(3AtIi6zkajKQauNQUCw|

diff --git a/src/cluster_view.c b/src/cluster_view.c
index c303500..a9fbd3b 100755
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -549,7 +549,7 @@ bool cluster_view_set_state(view_state_t state)
 	} else if (state == VIEW_STATE_ADD_VIEWER) {
 		add_widget_viewer_win_create();
 	} else if (state == VIEW_STATE_ALL_PAGE) {
-		elm_win_indicator_mode_set(app_get_win(), ELM_WIN_INDICATOR_HIDE);
+		elm_win_indicator_mode_set(app_get_win(), ELM_WIN_INDICATOR_SHOW);
 		app_btn_hide(HOMESCREEN_VIEW_HOME);
 		page_indicator_hide(cluster_view_s.indicator);
 
@@ -954,17 +954,23 @@ static void __cluster_view_allpage_get_page_pos(int page_idx, int *w, int *h)
 {
 	int row, col;
 	int start_y = 0;
-	if (cluster_view_s.page_count < 2) {
+	if (cluster_view_s.page_count < 3) {
 		start_y = (WINDOW_H - CLUSTER_ALL_PAGE_H) / 2;
-	} else if (cluster_view_s.page_count < 4) {
+	} else if (cluster_view_s.page_count < 7) {
 		start_y = (WINDOW_H - (CLUSTER_ALL_PAGE_H * 2 + CLUSTER_ALL_PAGE_GAP_H)) / 2;
 	} else {
 		start_y = (WINDOW_H - (CLUSTER_ALL_PAGE_H * 3 + CLUSTER_ALL_PAGE_GAP_H * 2)) / 2;
 	}
-	row = page_idx / 2;
-	col = page_idx % 2;
+	row = page_idx / 3;
+	col = page_idx % 3;
 
-	*w = CLUSTER_ALL_PAGE_PADDING_SIDE + (col * (CLUSTER_ALL_PAGE_W + CLUSTER_ALL_PAGE_GAP_W));
+	if (page_idx < 1 && cluster_view_s.page_count < 2) {
+		*w =(WINDOW_W-(2*CLUSTER_ALL_PAGE_W + CLUSTER_ALL_PAGE_GAP_W))/2;
+	} else if(page_idx < 2 && cluster_view_s.page_count < 2) {
+		*w =(WINDOW_W-(2*CLUSTER_ALL_PAGE_W + CLUSTER_ALL_PAGE_GAP_W))/2 + CLUSTER_ALL_PAGE_W + CLUSTER_ALL_PAGE_GAP_W;
+	} else {
+		*w = CLUSTER_ALL_PAGE_PADDING_SIDE + (col * (CLUSTER_ALL_PAGE_W + CLUSTER_ALL_PAGE_GAP_W));
+	}
 	*h = start_y + (row * (CLUSTER_ALL_PAGE_H + CLUSTER_ALL_PAGE_GAP_H));
 }
 
@@ -973,9 +979,9 @@ static int __cluster_view_allpage_get_page_index(int x, int y)
 	int idx = 0;
 	int sx = CLUSTER_ALL_PAGE_PADDING_SIDE;
 	int sy = 0;
-	if (cluster_view_s.page_count < 2) {
+	if (cluster_view_s.page_count < 3) {
 		sy = (WINDOW_H - CLUSTER_ALL_PAGE_H) / 2;
-	} else if (cluster_view_s.page_count < 4) {
+	} else if (cluster_view_s.page_count < 7) {
 		sy = (WINDOW_H - (CLUSTER_ALL_PAGE_H * 2 + CLUSTER_ALL_PAGE_GAP_H)) / 2;
 	} else {
 		sy = (WINDOW_H - (CLUSTER_ALL_PAGE_H * 3 + CLUSTER_ALL_PAGE_GAP_H * 2)) / 2;
@@ -984,14 +990,14 @@ static int __cluster_view_allpage_get_page_index(int x, int y)
 	int h = CLUSTER_ALL_PAGE_H + CLUSTER_ALL_PAGE_GAP_H;
 
 	for (idx = 0; idx < cluster_view_s.page_count; idx++) {
-		int row = idx / 2;
-		int col = idx % 2;
+		int row = idx / 3;
+		int col = idx % 3;
 		int ny = sy + (row * h) + (CLUSTER_ALL_PAGE_H / 2);
 		int nx = sx + (col * w) + (CLUSTER_ALL_PAGE_W / 2);
 
 		int d = (ny - y) * (ny - y) + (nx - x) * (nx - x);
 		if (d < CLUSTER_VIEW_ALLPAGE_MOVE_GAP) {
-			return (row * 2) + col;
+			return (row * 3) + col;
 		}
 	}
 
-- 
2.7.4