From: Taehyub Kim Date: Wed, 15 Jul 2020 08:34:39 +0000 (+0900) Subject: rotary_selector: make rotary_selector scalability X-Git-Tag: submit/tizen/20200719.223823~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e6f28013e710e67a686ad6869a1c4e46a0f755d;p=platform%2Fcore%2Fuifw%2Fefl-ext.git rotary_selector: make rotary_selector scalability To support multi scale targets, the size of rotary selector should be scalabe. so applied ELM_SCALE_SIZE to the size variables of rotary selector. Change-Id: I3a5e01676928e739e6693e82424abc93d59db51a --- diff --git a/src/wearable/efl_extension_rotary_selector.c b/src/wearable/efl_extension_rotary_selector.c index f49c6f8..96c08d4 100644 --- a/src/wearable/efl_extension_rotary_selector.c +++ b/src/wearable/efl_extension_rotary_selector.c @@ -26,10 +26,10 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #define EEXT_ROTARY_SELECTOR_DATA_KEY "eext_rotary_selector_data" -#define _ROTARY_SELECTOR_SCREEN_WIDTH 360 -#define _ROTARY_SELECTOR_SCREEN_HEIGHT 360 -#define _ROTARY_SELECTOR_SELECTOR_TOUCH_AREA_WIDTH 180 -#define _ROTARY_SELECTOR_SELECTOR_TOUCH_AREA_HEIGHT 180 +#define _ROTARY_SELECTOR_SCREEN_WIDTH ELM_SCALE_SIZE(360) +#define _ROTARY_SELECTOR_SCREEN_HEIGHT ELM_SCALE_SIZE(360) +#define _ROTARY_SELECTOR_SELECTOR_TOUCH_AREA_WIDTH ELM_SCALE_SIZE(180) +#define _ROTARY_SELECTOR_SELECTOR_TOUCH_AREA_HEIGHT ELM_SCALE_SIZE(180) #define _ROTARY_SELECTOR_ITEM_DIVISION_ANGLE 30 #define _ROTARY_SELECTOR_PAGE_ITEM_MAX 11 #define _ROTARY_SELECTOR_PAGE_ANIMATION_DURATION 0.3 @@ -49,8 +49,8 @@ #define _ROTARY_SELECTOR_ROTARY_EVENT_TIME_ACCELERATION_THRESHOLD 60 //ONEUI1.5(18Jun2018): Adjust drag iem size as per GUI -#define _ROTARY_SELECTOR_DRAG_ITEM_WIDTH 80 -#define _ROTARY_SELECTOR_DRAG_ITEM_HEIGHT 80 +#define _ROTARY_SELECTOR_DRAG_ITEM_WIDTH ELM_SCALE_SIZE(80) +#define _ROTARY_SELECTOR_DRAG_ITEM_HEIGHT ELM_SCALE_SIZE(80) // //ONEUI1.5(04Jun2018) : Delay for item animatoin #define _ROTARY_SELECTOR_ITEM_SWAP_ANIMATOIN_DELAY_TIME 0.1 @@ -1589,7 +1589,7 @@ _eext_rotary_selector_data_init(Evas_Object *obj, Evas_Object *parent) free(rsd); return NULL; } - rsd->radius = atoi(radius); + rsd->radius = ELM_SCALE_SIZE(atoi(radius)); item_width = edje_object_data_get(elm_layout_edje_get(obj), "item_width"); if (!item_width) @@ -1598,7 +1598,7 @@ _eext_rotary_selector_data_init(Evas_Object *obj, Evas_Object *parent) free(rsd); return NULL; } - rsd->item_width = (Evas_Coord)atoi(item_width); + rsd->item_width = ELM_SCALE_SIZE(atoi(item_width)); item_height = edje_object_data_get(elm_layout_edje_get(obj), "item_height"); if (!item_height) @@ -1607,7 +1607,7 @@ _eext_rotary_selector_data_init(Evas_Object *obj, Evas_Object *parent) free(rsd); return NULL; } - rsd->item_height = (Evas_Coord)atoi(item_height); + rsd->item_height = ELM_SCALE_SIZE(atoi(item_height)); data = edje_object_data_get(elm_layout_edje_get(obj), "delete_icon_width"); if (!data) @@ -1617,7 +1617,7 @@ _eext_rotary_selector_data_init(Evas_Object *obj, Evas_Object *parent) return NULL; } //ONEUI1.5(20180620):Size up for delete icon touch detection - rsd->delete_icon_width = (Evas_Coord)atoi(data) + 10; + rsd->delete_icon_width = ELM_SCALE_SIZE((atoi(data) + 10)); // data = edje_object_data_get(elm_layout_edje_get(obj), "delete_icon_height"); if (!data) @@ -1627,7 +1627,7 @@ _eext_rotary_selector_data_init(Evas_Object *obj, Evas_Object *parent) return NULL; } //ONEUI1.5(20180620):Size up for delete icon touch detection - rsd->delete_icon_height = (Evas_Coord)atoi(data) + 10; + rsd->delete_icon_height = ELM_SCALE_SIZE((atoi(data) + 10)); // data = edje_object_data_get(elm_layout_edje_get(obj), "page_item_width"); if (!data) @@ -1636,7 +1636,7 @@ _eext_rotary_selector_data_init(Evas_Object *obj, Evas_Object *parent) free(rsd); return NULL; } - rsd->page_item_width = (Evas_Coord)atoi(data); + rsd->page_item_width = ELM_SCALE_SIZE(atoi(data)); data = edje_object_data_get(elm_layout_edje_get(obj), "page_item_height"); if (!data) @@ -1645,7 +1645,7 @@ _eext_rotary_selector_data_init(Evas_Object *obj, Evas_Object *parent) free(rsd); return NULL; } - rsd->page_item_height = (Evas_Coord)atoi(data); + rsd->page_item_height = ELM_SCALE_SIZE(atoi(data)); rsd->rotary_event_time_stamp = 0.0; LOGI("rsd is initialized!!"); @@ -2574,8 +2574,8 @@ _layer_items_invalidate(Eext_Rotary_Selector_Data *rsd) _eext_rotary_selector_color_class_parent_set(rsd->prev_page, rsd->rotary_selector); } _circle_path_interpolator(rsd, 1, 0, -90, radius, radius, &coord_x, &coord_y, EINA_TRUE); - evas_object_move(rsd->prev_page, (Evas_Coord)(x + coord_x + rsd->page_item_width * 0.5 + 6), - (Evas_Coord)(y + coord_y + rsd->page_item_height * 0.5 + 12)); + evas_object_move(rsd->prev_page, (Evas_Coord)(x + coord_x + rsd->page_item_width * 0.5 + ELM_SCALE_SIZE(6)), + (Evas_Coord)(y + coord_y + rsd->page_item_height * 0.5 + ELM_SCALE_SIZE(12))); if (it) { btn = it->base.obj; @@ -2605,8 +2605,8 @@ _layer_items_invalidate(Eext_Rotary_Selector_Data *rsd) _eext_rotary_selector_color_class_parent_set(rsd->next_page, rsd->rotary_selector); } _circle_path_interpolator(rsd, 1, 0, -90, radius, radius, &coord_x, &coord_y, EINA_TRUE); - evas_object_move(rsd->next_page, (Evas_Coord)(x + coord_x - rsd->page_item_width * 0.5 - 6), - (Evas_Coord)(y + coord_y + rsd->page_item_height * 0.5 + 12)); + evas_object_move(rsd->next_page, (Evas_Coord)(x + coord_x - rsd->page_item_width * 0.5 - ELM_SCALE_SIZE(6)), + (Evas_Coord)(y + coord_y + rsd->page_item_height * 0.5 + ELM_SCALE_SIZE(12))); if (it) { btn = it->base.obj; @@ -3049,8 +3049,8 @@ _previous_page_animator_cb(void *data) evas_object_geometry_get(rsd->rotary_selector, &x, &y, NULL, NULL); _circle_path_interpolator(rsd, p, 255.f, 270.f, radius, radius, &px, &py, EINA_TRUE); - evas_object_move(rsd->next_page, (Evas_Coord)(px + x + rsd->page_item_width * 0.5 - 6), - (Evas_Coord)(py + y + rsd->page_item_height * 0.5 + 6)); + evas_object_move(rsd->next_page, (Evas_Coord)(px + x + rsd->page_item_width * 0.5 - ELM_SCALE_SIZE(6)), + (Evas_Coord)(py + y + rsd->page_item_height * 0.5 + ELM_SCALE_SIZE(6))); evas_object_color_set(rsd->next_page, 255, 255, 255, new_a); } else @@ -3069,8 +3069,8 @@ _previous_page_animator_cb(void *data) evas_object_geometry_get(rsd->rotary_selector, &x, &y, NULL, NULL); _circle_path_interpolator(rsd, p, -90.f, -105.f, radius, radius, &px, &py, EINA_TRUE); - evas_object_move(rsd->prev_page, (Evas_Coord)(px + x + rsd->page_item_width * 0.5 + 6 ), - (Evas_Coord)(py + y + rsd->page_item_height * 0.5 + 12)); + evas_object_move(rsd->prev_page, (Evas_Coord)(px + x + rsd->page_item_width * 0.5 + ELM_SCALE_SIZE(6)), + (Evas_Coord)(py + y + rsd->page_item_height * 0.5 + ELM_SCALE_SIZE(12))); evas_object_color_set(rsd->prev_page, 255, 255, 255, new_a); } } @@ -3266,7 +3266,7 @@ _next_page_animator_cb(void *data) evas_object_geometry_get(rsd->rotary_selector, &x, &y, NULL, NULL); _circle_path_interpolator(rsd, p, 255.f, 270.f, rsd->radius, rsd->radius, &px, &py, EINA_TRUE); - evas_object_move(rsd->prev_page, (Evas_Coord)(px + x + rsd->page_item_width * 0.5 + 6 ), + evas_object_move(rsd->prev_page, (Evas_Coord)(px + x + rsd->page_item_width * 0.5 + ELM_SCALE_SIZE(6)), (Evas_Coord)(py + y)); evas_object_color_set(rsd->prev_page, 255, 255, 255, new_a); } @@ -3286,8 +3286,8 @@ _next_page_animator_cb(void *data) evas_object_geometry_get(rsd->rotary_selector, &x, &y, NULL, NULL); _circle_path_interpolator(rsd, p, 260.f, 245.f, rsd->radius, rsd->radius, &px, &py, EINA_TRUE); - evas_object_move(rsd->next_page, (Evas_Coord)(px + x + rsd->page_item_width * 0.5 + 7), - (Evas_Coord)(py + y - 13)); + evas_object_move(rsd->next_page, (Evas_Coord)(px + x + rsd->page_item_width * 0.5 + ELM_SCALE_SIZE(7)), + (Evas_Coord)(py + y - ELM_SCALE_SIZE(13))); evas_object_color_set(rsd->next_page, 255, 255, 255, new_a); } }