button : Apply tizen_vector for support to vector_ux 42/176742/1
authorJunsuChoi <jsuya.choi@samsung.com>
Mon, 23 Apr 2018 06:24:53 +0000 (15:24 +0900)
committerJunsuChoi <jsuya.choi@samsung.com>
Mon, 23 Apr 2018 06:24:53 +0000 (15:24 +0900)
Change-Id: I9005ad0c4d019430748693353bd431ec1238ed6b

src/lib/elementary/efl_ui_button.c
src/lib/elementary/elm_priv.h
src/lib/elementary/tizen_vector.c

index ecf3192..27b040f 100644 (file)
@@ -230,6 +230,11 @@ _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_
                                        elm_widget_theme_element_get(obj),
                                        elm_widget_theme_style_get(obj)))
      CRI("Failed to set layout!");
+
+#ifdef TIZEN_VECTOR_UX
+   tizen_vg_button_set(obj);
+#endif
+
 }
 
 EOLIAN static Eo *
@@ -430,6 +435,10 @@ _efl_ui_button_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
    if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
    _icon_signal_emit(obj);
 
+#ifdef TIZEN_VECTOR_UX
+   tizen_vg_button_set(obj);
+#endif
+
    return int_ret;
 }
 
index 0dad45b..ef9d9c6 100644 (file)
@@ -820,6 +820,7 @@ double _elm_atof(const char *s);
 #define TIZEN_VECTOR_UX 1
 
 #ifdef TIZEN_VECTOR_UX
+void tizen_vg_button_set(Elm_Button *obj);
 void tizen_vg_progressbar_set(Elm_Progressbar *obj);
 #endif
 
index 7c4cd0e..c0146f7 100644 (file)
@@ -1295,7 +1295,8 @@ button_no_bg_init(vg_button *vd)
    vd->init = EINA_TRUE;
 
    //Effect Shape
-   Efl_VG *effect_root = evas_object_vg_root_node_get(vd->vg[0]);
+   Efl_VG *effect_root = evas_vg_container_add(vd->vg[0]);
+   evas_object_vg_root_node_set(vd->vg[0], effect_root);
    vd->shape[0] = evas_vg_shape_add(effect_root);
    evas_vg_node_color_set(vd->shape[0], 255, 255, 255, 255);
 }
@@ -1394,12 +1395,14 @@ button_init(vg_button *vd)
    vd->init = EINA_TRUE;
 
    //Base Shape
-   Efl_VG *base_root = evas_object_vg_root_node_get(vd->vg[0]);
+   Efl_VG *base_root = evas_vg_container_add(vd->vg[0]);
+   evas_object_vg_root_node_set(vd->vg[0], base_root);
    vd->shape[0] = evas_vg_shape_add(base_root);
    evas_vg_node_color_set(vd->shape[0], 255, 255, 255, 255);
 
    //Effect Shape
-   Efl_VG *effect_root = evas_object_vg_root_node_get(vd->vg[1]);
+   Efl_VG *effect_root = evas_vg_container_add(vd->vg[1]);
+   evas_object_vg_root_node_set(vd->vg[1], effect_root);
    vd->shape[1] = evas_vg_shape_add(effect_root);
    evas_vg_node_color_set(vd->shape[1], 255, 255, 255, 255);
 }