Added the arrow image on the sort button according to GUI

Change-Id: I53e9d09667f1e249f1983e3c077f520c96c3c527
Signed-off-by: Hyojung Jo <hj903.jo@samsung.com>

diff --git a/include/define.h b/include/define.h
index b909aafde04479442102cd9ba97724f0aad82f29..c9779e7547a3d1afd2dc7a0024f04cb92afd0a9e 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -105,6 +105,10 @@
 #define DEFAULT_APP_ICON_PNG IMGDIR"/ico_default.png"
 #define FAVORITE_ICON_PNG IMGDIR"/ic_thumbnail_favorite_01.png"
 #define BROWSER_ICON_PNG IMGDIR"/ic_apps_web.png"
+#define ARROW_ICON_UP_PNG "btn_option_arrow_nor.png"
+#define ARROW_ICON_UP_FOC_PNG "btn_option_arrow_foc_up.png"
+#define ARROW_ICON_SEL_PNG "btn_option_arrow_sel.png"
+#define ARROW_ICON_DISABLE_PNG "btn_option_arrow_dis.png"
 
 /* Transition */
 #define TRANSITION_FOCUS DECELERATE 0.20

diff --git a/res/images/btn_option_arrow_dis.png b/res/images/btn_option_arrow_dis.png
new file mode 100644 (file)
index 0000000..dc33937
Binary files /dev/null and b/res/images/btn_option_arrow_dis.png differ

diff --git a/res/images/btn_option_arrow_foc_up.png b/res/images/btn_option_arrow_foc_up.png
new file mode 100644 (file)
index 0000000..f101da0
Binary files /dev/null and b/res/images/btn_option_arrow_foc_up.png differ

diff --git a/res/images/btn_option_arrow_nor.png b/res/images/btn_option_arrow_nor.png
new file mode 100644 (file)
index 0000000..17bc2c6
Binary files /dev/null and b/res/images/btn_option_arrow_nor.png differ

diff --git a/res/images/btn_option_arrow_sel.png b/res/images/btn_option_arrow_sel.png
new file mode 100644 (file)
index 0000000..21b5ffa
Binary files /dev/null and b/res/images/btn_option_arrow_sel.png differ

diff --git a/res/widget/button.edc b/res/widget/button.edc
index bc76aca837417e35011bd14056f443287fd2c426..f1f75704254876716617b0a129f56e7ce051b6b7 100644 (file)
--- a/res/widget/button.edc
+++ b/res/widget/button.edc
@@ -277,9 +277,17 @@ group {
 group {
        name, "elm/button/base/style.sort.button";
        data.item, "focus_highlight" "on";
+       images {
+               image, ARROW_ICON_UP_PNG COMP;
+               image, ARROW_ICON_UP_FOC_PNG COMP;
+               image, ARROW_ICON_SEL_PNG COMP;
+               image, ARROW_ICON_DISABLE_PNG COMP;
+       }
+
        script {
                public cur_state;
        }
+
        parts {
                part {
                        name, "part.bg";
@@ -450,7 +458,7 @@ group {
                                text {
                                        font, FONT_TIZENSANS_LIGHT;
                                        size, 32;
-                                       align, 0.5 0.5;
+                                       align, 0.0 0.5;
                                }
                        }
                        description {
@@ -469,6 +477,59 @@ group {
                                color, 87 87 87 127;
                        }
                }
+
+               part {
+                       name, "padding.arrow";
+                       type, SPACER;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 4 17;
+                               rel1 {
+                                       to, "elm.text";
+                                       relative, 1.0 0.0;
+                               }
+                               rel2 {
+                                       to, "elm.text";
+                                       relative, 1.0 0.0;
+                               }
+                               align, 0.0 0.0;
+                               fixed, 1 1;
+                       }
+               }
+
+               part {
+                       name, "part.arrow";
+                       type, IMAGE;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 20 30;
+                               image.normal, ARROW_ICON_UP_PNG;
+                               rel1 {
+                                       to, "padding.arrow";
+                                       relative, 1.0 1.0;
+                               }
+                               rel2.to, "padding.arrow";
+                               align, 0.0 0.0;
+                               fixed, 1 1;
+                       }
+                       description {
+                               state, "focused" 0.0;
+                               inherit, "default" 0.0;
+                               image.normal, ARROW_ICON_UP_FOC_PNG;
+                       }
+                       description {
+                               state, "selected" 0.0;
+                               inherit, "default" 0.0;
+                               image.normal, ARROW_ICON_SEL_PNG;
+                       }
+                       description {
+                               state, "disable" 0.0;
+                               inherit, "default" 0.0;
+                               image.normal, ARROW_ICON_DISABLE_PNG;
+                       }
+               }
        }
 
        programs{
@@ -492,6 +553,7 @@ group {
                                if (state == STATE_SELECTED) {
                                        set_state(PART:"part.bg", "selected", 0.0);
                                        set_state(PART:"elm.text", "selected", 0.0);
+                                       set_state(PART:"part.arrow", "selected", 0.0);
                                        set_state(PART:"part.inside.line.up", "selected", 0.0);
                                        set_state(PART:"part.inside.line.down", "selected", 0.0);
                                        set_state(PART:"part.inside.line.left", "selected", 0.0);
@@ -507,6 +569,7 @@ group {
                        action, STATE_SET "focused" 0.0;
                        target, "part.bg";
                        target, "elm.text";
+                       target, "part.arrow";
                        target, "part.inside.line.up";
                        target, "part.inside.line.down";
                        target, "part.inside.line.left";
@@ -519,6 +582,7 @@ group {
                        action, STATE_SET "default" 0.0;
                        target, "part.bg";
                        target, "elm.text";
+                       target, "part.arrow";
                        target, "part.inside.line.up";
                        target, "part.inside.line.down";
                        target, "part.inside.line.left";
@@ -534,6 +598,7 @@ group {
                                set_int(cur_state, STATE_SELECTED);
                                set_state(PART:"part.bg", "selected", 0.0);
                                set_state(PART:"elm.text", "selected", 0.0);
+                               set_state(PART:"part.arrow", "selected", 0.0);
                                set_state(PART:"part.inside.line.up", "selected", 0.0);
                                set_state(PART:"part.inside.line.down", "selected", 0.0);
                                set_state(PART:"part.inside.line.left", "selected", 0.0);
@@ -547,6 +612,7 @@ group {
                        source, SRC_SORT_BTN;
                        script {
                                set_state(PART:"elm.text", "disable", 0.0);
+                               set_state(PART:"part.arrow", "disable", 0.0);
                                set_state(PART:"part.inside.line.up", "disable", 0.0);
                                set_state(PART:"part.inside.line.down", "disable", 0.0);
                                set_state(PART:"part.inside.line.left", "disable", 0.0);
@@ -676,5 +742,27 @@ group {
                                color, 64 136 211 255;
                        }
                }
+
+               part {
+                       name, "part.arrow";
+                       type, IMAGE;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               visible, 0;
+                       }
+                       description {
+                               state, "focused" 0.0;
+                               inherit, "default" 0.0;
+                       }
+                       description {
+                               state, "selected" 0.0;
+                               inherit, "default" 0.0;
+                       }
+                       description {
+                               state, "disable" 0.0;
+                               inherit, "default" 0.0;
+                       }
+               }
        }
 }