From c32e417d5d01f99a44935da3fcf625b59cbf2cc2 Mon Sep 17 00:00:00 2001
From: Hermet Park <hermet@hermet.pe.kr>
Date: Fri, 20 May 2016 00:32:25 +0900
Subject: [PATCH] live_edit: remove margin in the spacer image.

spacer margin should be removed from the image
because live edit needs accruate pixel control.
on the other hands, spacer button icon needs margin.

this implementation is a little tricky but i have no idea better than this.
---
 data/themes/default/images.edc                  |   2 ++
 data/themes/default/images/Makefile.am          |   1 +
 data/themes/default/images/live_spacer.png      | Bin 347 -> 337 bytes
 data/themes/default/images/live_spacer_icon.png | Bin 0 -> 347 bytes
 data/themes/default/images/spacer.png           | Bin 154 -> 0 bytes
 src/bin/live_edit.c                             |  10 ++++++++--
 6 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 data/themes/default/images/live_spacer_icon.png
 delete mode 100644 data/themes/default/images/spacer.png

diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index 7b7389b..d5ccd53 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -21,6 +21,7 @@ images {
    image: "live_rectangle.png" COMP;
    image: "live_swallow.png" COMP;
    image: "live_spacer.png" COMP;
+   image: "live_spacer_icon.png" COMP;
    image: "live_text.png" COMP;
    image: "live_textblock.png" COMP;
    image: "expand.png" COMP;
@@ -75,6 +76,7 @@ ICON_GROUP("invert", "invert.png")
 ICON_GROUP("Image", "live_image.png")
 ICON_GROUP("Rect", "live_rectangle.png")
 ICON_GROUP("Spacer", "live_spacer.png")
+ICON_GROUP("Spacer_Icon", "live_spacer_icon.png")
 ICON_GROUP("Swallow", "live_swallow.png")
 ICON_GROUP("Text", "live_text.png")
 ICON_GROUP("Textblock", "live_textblock.png")
diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am
index 7cfb2fe..563c471 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -56,6 +56,7 @@ EXTRA_DIST = \
    live_rectangle.png \
    live_swallow.png \
    live_spacer.png \
+   live_spacer_icon.png \
    live_text.png \
    live_textblock.png \
    new.png \
diff --git a/data/themes/default/images/live_spacer.png b/data/themes/default/images/live_spacer.png
index 8aa75fad712a89116390c7a0626660bbd8c1926b..b2821c6758e07fe60de8d3350d38194ef1359715 100644
GIT binary patch
delta 264
zcmV+j0r&pf0?`7HQhx;!5C#d`z#S9-007=eL_t(I%dOL~P6IIz1kmS;Ap(I!dAeVt
zLP(_MODGXERQw-B3NBG>3T)({Q^X}qW$mnIceOhq=X{GZ1ibl1jkVa~y}a*`v5mOG
z5(@|+$T?r*{FlI3IJm(MV@N5jirQ<}b^d}Pvib=O!(bSOmVZ3-QQ!Caz6T+tR9oH5
z>|g;ggm7Qt&*tF)B9h~fpmQSP2_oIUj1X~gq`>9gS`O`hYK=8NP94e|gq(9d$(P0p
z)5-hXs_kHjM?5v;vKS^7uZ*=w$=zX$SQj!hW32I6KGrpFo9Z9c&R@a+T_iko`XK-S
O002ovPDHLkU;%=3dwE*`

delta 274
zcmV+t0qy?L0^0(RQhx#w4Jt2$m#~@u008JoL_t(I%dL~WP6IIzgul%l7oFrtl$IZj
zR47ue&XZ76QSp8hDTt!%(5#P33giGIZ87_&(Ryr>0JgvbV8GjgFL4ImfoDLK_hyEq
z1gwEB_y!nm7M!B?2wW-$z}+Wz-_r<5lcZ@*lu{_A)Z$Nr0Dt71$vJ-)+<kEO;SL3z
zqz+&OU}ifr+tH4F1br33eVF@K{1N>x7hU&{<H$IU&C@9*Qc71>O<|_iSJ;HvW+~f<
zRy;+_Hvm{mIsh-g6xO~(kAM^K3LL7HmkW-Ou<-j4_>94-@*K5~#b^2l+<L#|FD&^N
Y6p(DVvSzJj01E&B07*qoM6N<$f}I?EJ^%m!

diff --git a/data/themes/default/images/live_spacer_icon.png b/data/themes/default/images/live_spacer_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8aa75fad712a89116390c7a0626660bbd8c1926b
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNlOV5_e#`U?vw%V`JY5_^EKaYTyw{J}P@rZ1Sy}P9
zPduhflkW}D2wHb;azJq4$2t+sjzw=Stm*gWdcvTbYxsNl#j2c14BHMcCmgulq+iH(
zuQA<W>i4v^B`j+i^?tBP<cZB$^o=7%i~Yb|_450dIXovX$@H5Nq_OnMBmZWGCv#3(
z){Eb%E%^SBk9F=6z692UG;8DA7yD{iYDEv$&iEbvNARz{c<lH7$0scM&R*734e|;P
z_f1@OE&N8y%{0y19bq=EXUrKQysa4Y4~Sgb=hELG{DDhm)zs<SeG@l)_$~OO=isVO
oGF$tPrvGBUQ?>u8zRpi^kqJ3FHl?ji1Nxc4)78&qol`;+08kc+M*si-

literal 0
HcmV?d00001

diff --git a/data/themes/default/images/spacer.png b/data/themes/default/images/spacer.png
deleted file mode 100644
index 8e3a0341c6f84f48d2319a68347e4cb20ffb7c70..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5<o#4PZ!4!kIuK39C;ZGcn%*Z(K`Rped5B7PcwWU*vZ`vTR62u`a|Y|
v`a_3f4y>HPZ6Q|7csxn(LBttWnb(Y0nxs-^r7ZFWn#17f>gTe~DWM4f+odgq

diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index c3f699f..7713ba7 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -120,7 +120,7 @@ static const liveedit_item LIVEEDIT_ITEMS[] =
      {"Image", EDJE_PART_TYPE_IMAGE},
      {"Swallow", EDJE_PART_TYPE_SWALLOW},
      {"Textblock", EDJE_PART_TYPE_TEXTBLOCK},
-     {"Spacer", EDJE_PART_TYPE_SPACER}
+     {"Spacer", EDJE_PART_TYPE_SPACER} //Please leave spacer at last
 };
 
 static Evas_Object *
@@ -2005,13 +2005,19 @@ live_edit_tools_create(Evas_Object *parent)
    Evas_Object *btn;
    int i;
 
-   for (i = 0; i < LIVEEDIT_ITEMS_NUM; i++)
+   for (i = 0; i < (LIVEEDIT_ITEMS_NUM - 1); i++)
      {
         btn = live_btn_create(parent, LIVEEDIT_ITEMS[i].name,
                               (void *)(uintptr_t) i);
         btn_list = eina_list_append(btn_list, btn);
      }
 
+   //Just for spacer. Because we'd like to avoid margin in the icon image,
+   //We use 2 images - button icon's and live edit object's.
+   btn = live_btn_create(parent, "Spacer_Icon",
+                         (void *)(uintptr_t) i);
+   btn_list = eina_list_append(btn_list, btn);
+
    return btn_list;
 }