Add more button to make scroll to bottom 66/49066/1 accepted/tizen/tv/20151006.225058 submit/tizen/20151006.111448
authorjinwoo.shin <jw0227.shin@samsung.com>
Tue, 6 Oct 2015 05:57:09 +0000 (14:57 +0900)
committerjinwoo.shin <jw0227.shin@samsung.com>
Tue, 6 Oct 2015 05:57:49 +0000 (14:57 +0900)
Change-Id: I4d45e47236c515b6254c0b67f7674815ce6c8c69
Signed-off-by: jinwoo.shin <jw0227.shin@samsung.com>
data/view/action_menu.edc
data/widget/button.edc
src/view_action_menu.c

index ff4b944..d7b9485 100644 (file)
@@ -321,36 +321,13 @@ group {
        name, GRP_ACTION_MENU_BOTTOM;
        parts {
                part {
-                       name, "padding.more.btn";
-                       type, SPACER;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               rel1.relative, 0.0 0.0;
-                               rel2.relative, 1.0 0.0;
-                               min, 0 116;
-                               align, 0.0 0.0;
-                               fixed, 1 0;
-                       }
-               }
-
-               part {
                        name, PART_MORE_BUTTON;
                        type, SWALLOW;
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               rel1 {
-                                       to, "padding.more.btn";
-                                       relative, 0.5 0.5;
-                               }
-                               rel2 {
-                                       to, "padding.more.btn";
-                                       relative, 0.5 0.5;
-                               }
-                               min, 184 60;
-                               align, 0.5 0.5;
-                               fixed, 1 1;
+                               min, 184 116;
+                               align, 0.5 0.0;
                        }
                }
        }
index fdc20e4..330dd36 100644 (file)
@@ -209,6 +209,42 @@ group {
        }
 }
 
+group {
+       name, "elm/button/base/style.more.button";
+       inherit, "elm/button/base/style.livetv.button";
+       data.item, "focus_highlight" "on";
+       parts {
+               part {
+                       name, "area";
+                       type, SPACER;
+                       mouse_events, 0;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 184 116;
+                       }
+               }
+
+               part {
+                       name, "part.bg";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1.relative, 0.0 0.5;
+                               rel2.relative, 1.0 0.5;
+                               min, 0 60;
+                               align, 0.0 0.5;
+                       }
+                       description {
+                               state: "focused" 0.0;
+                               inherit: "default" 0.0;
+                               color: 0 119 246 255;
+                       }
+               }
+       }
+}
+
 #define DEFAULT 1
 #define SELECTED 2
 #define FOCUSED 3
index b66b36c..c42aaba 100644 (file)
@@ -38,6 +38,7 @@
 #define KEY_BUTTON "KEY_BUTTON"
 
 #define STYLE_LIVETV_BTN "style.livetv.button"
+#define STYLE_MORE_BTN "style.more.button"
 #define STYLE_ACTION_MENU_BTN "style.action.menu.button"
 #define STYLE_ACTION_MENU_FAVORITE "style.action.menu.favorite"
 
@@ -690,7 +691,7 @@ static bool _draw_bottom_area(struct _priv *priv)
        elm_box_pack_end(priv->box, layout);
 
        btn = util_add_button(layout,
-                       PART_MORE_BUTTON, STR_BUTTON_MORE, STYLE_LIVETV_BTN);
+                       PART_MORE_BUTTON, STR_BUTTON_MORE, STYLE_MORE_BTN);
        if (!btn) {
                _ERR("failed to create more button");
                return false;
@@ -829,6 +830,8 @@ static void _destroy(void *data)
        }
        priv = data;
 
+       elm_layout_signal_callback_del(priv->base, SIGNAL_HIDE_FINISHED,
+                       SOURCE_ELM, _hide_finished_cb);
        inputmgr_remove_all_by_tag(VIEW_ACTION_MENU);
 
        evas_object_del(priv->base);