[Check] consider scalability of off bg 48/52648/1 accepted/tizen/mobile/20151126.073225 accepted/tizen/tv/20151126.073246 accepted/tizen/wearable/20151126.073254 submit/tizen/20151126.042104
authorSung-Taek Hong <sth253.hong@samsung.com>
Fri, 13 Nov 2015 07:30:24 +0000 (16:30 +0900)
committerSung-Taek Hong <sth253.hong@samsung.com>
Wed, 25 Nov 2015 08:17:35 +0000 (17:17 +0900)
Change-Id: I29e0db091dda6e26e86cf1604ca5870a25f058eb
Signed-off-by: Sung-Taek Hong <sth253.hong@samsung.com>
src/lib/tizen_vector.c

index f2fda2c3e793b0487d4a6cdb51dc8a6df06a922a..63ac9b2403866f4397e34e83e86b8334389316f9 100644 (file)
@@ -883,21 +883,21 @@ check_default_init(check_default *vd)
 }
 
 static void
-_update_default_check_shape(check_default *vd, Efl_VG *shape, Eina_Bool outline)
+_update_default_check_shape(check_default *vd, Efl_VG *shape, Eina_Bool outline, Eo *obj)
 {
+   Evas_Coord w, h;
+   Eina_Matrix3 m;
+
+   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+   double scale_x = w / 50.0;
+   double scale_y = h / 50.0;
+   eina_matrix3_identity(&m);
+   eina_matrix3_scale(&m, scale_x, scale_y);
    evas_vg_shape_shape_reset(shape);
    if (outline)
      {
         // outline
-        Evas_Coord w, h;
-        evas_object_geometry_get(vd->vg[0], NULL, NULL, &w, &h);
-        double scale_x = w/50.0;
-        double scale_y = h/50.0;
-
         evas_vg_shape_shape_append_svg_path(shape, check_default_outline);
-        Eina_Matrix3 m;
-        eina_matrix3_identity(&m);
-        eina_matrix3_scale(&m, scale_x, scale_y);
         if (eina_matrix3_type_get(&m) != EINA_MATRIX_TYPE_IDENTITY)
           evas_vg_node_transformation_set(shape, &m);
 
@@ -910,8 +910,8 @@ _update_default_check_shape(check_default *vd, Efl_VG *shape, Eina_Bool outline)
      {
         // fill
         evas_vg_shape_shape_append_svg_path(shape, check_default_fill);
-        evas_vg_node_origin_set(shape, 0, 0);
-        evas_vg_node_transformation_set(shape, NULL);
+        if (eina_matrix3_type_get(&m) != EINA_MATRIX_TYPE_IDENTITY)
+          evas_vg_node_transformation_set(shape, &m);
 
         // update color
         evas_vg_node_color_set(shape, 255, 255, 255, 255);
@@ -926,7 +926,7 @@ check_default_vg_bg_resize_cb(void *data, Evas *e EINA_UNUSED,
 {
    check_default *vd = data;
    check_default_init(vd);
-   _update_default_check_shape(vd, vd->shape[4], elm_check_state_get(vd->obj));
+   _update_default_check_shape(vd, vd->shape[4], elm_check_state_get(vd->obj), vd->vg[2]);
 }
 
 static void
@@ -944,10 +944,10 @@ check_default_vg_resize_cb(void *data, Evas *e EINA_UNUSED,
    double center_y = ((double)h / 2);
 
    //Update Outline Shape
-   _update_default_check_shape(vd, vd->shape[0], EINA_TRUE);
+   _update_default_check_shape(vd, vd->shape[0], EINA_TRUE, vd->vg[0]);
 
    //Update BG Shape
-   _update_default_check_shape(vd, vd->shape[1], EINA_FALSE);
+   _update_default_check_shape(vd, vd->shape[1], EINA_FALSE, vd->vg[0]);
 
    if (elm_check_state_get(vd->obj))
      evas_vg_node_color_set(vd->shape[1], 255, 255, 255, 255);
@@ -1170,7 +1170,7 @@ check_default_action_toggle_cb(void *data, Evas_Object *obj EINA_UNUSED,
    else
      elm_transit_go(vd->transit[2]);
 
-   _update_default_check_shape(vd, vd->shape[4], elm_check_state_get(vd->obj));
+   _update_default_check_shape(vd, vd->shape[4], elm_check_state_get(vd->obj), vd->vg[2]);
 }
 
 static void
@@ -1187,7 +1187,7 @@ check_default_state_toggle_cb(void *data, Evas_Object *obj EINA_UNUSED,
    _check_default_bg_color(vd, 1.0);
    _check_default_bg_scale(vd, 1.0);
    _check_default_line(vd, 1.0);
-   _update_default_check_shape(vd, vd->shape[4], elm_check_state_get(vd->obj));
+   _update_default_check_shape(vd, vd->shape[4], elm_check_state_get(vd->obj), vd->vg[2]);
 
    // update outline color
    if (elm_check_state_get(vd->obj))