seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=908f1892437fac0aecc3d2c011626ef6038043e8
commit 908f1892437fac0aecc3d2c011626ef6038043e8 Author: Daniel Juyung Seo <[email protected]> Date: Mon Feb 23 08:43:47 2015 +0900 elm: Remove redundant finger size adjustment. This is a successor of a54da8aab. --- src/lib/elm_button.c | 1 - src/lib/elm_check.c | 1 - src/lib/elm_clock.c | 2 -- src/lib/elm_dayselector.c | 1 - src/lib/elm_genlist.c | 2 -- src/lib/elm_list.c | 2 -- src/lib/elm_photo.c | 1 - src/lib/elm_radio.c | 1 - src/lib/elm_segment_control.c | 1 - src/lib/elm_slider.c | 1 - src/lib/elm_spinner.c | 1 - src/lib/elm_toolbar.c | 7 ------- 12 files changed, 21 deletions(-) diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index 3083a7b..1bba57d 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -79,7 +79,6 @@ _elm_button_elm_layout_sizing_eval(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); - elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(obj, minw, minh); } diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c index 9077d5e..27f38d0 100644 --- a/src/lib/elm_check.c +++ b/src/lib/elm_check.c @@ -161,7 +161,6 @@ _elm_check_elm_layout_sizing_eval(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); - elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_max_set(obj, -1, -1); } diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c index 72191a9..066360d 100644 --- a/src/lib/elm_clock.c +++ b/src/lib/elm_clock.c @@ -415,7 +415,6 @@ _time_update(Evas_Object *obj) elm_coords_finger_size_adjust(1, &mw, 2, &mh); edje_object_size_min_restricted_calc (sd->digit[i], &mw, &mh, mw, mh); - elm_coords_finger_size_adjust(1, &mw, 2, &mh); evas_object_size_hint_min_set(sd->digit[i], mw, mh); snprintf(buf, sizeof(buf), "d%i", i); elm_layout_content_set(obj, buf, sd->digit[i]); @@ -449,7 +448,6 @@ _time_update(Evas_Object *obj) elm_coords_finger_size_adjust(1, &mw, 2, &mh); edje_object_size_min_restricted_calc (sd->am_pm_obj, &mw, &mh, mw, mh); - elm_coords_finger_size_adjust(1, &mw, 2, &mh); evas_object_size_hint_min_set(sd->am_pm_obj, mw, mh); elm_layout_content_set(obj, "ampm", sd->am_pm_obj); evas_object_show(sd->am_pm_obj); diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c index 2c7236d..1d834f8 100644 --- a/src/lib/elm_dayselector.c +++ b/src/lib/elm_dayselector.c @@ -40,7 +40,6 @@ _elm_dayselector_elm_layout_sizing_eval(Eo *obj, Elm_Dayselector_Data *sd EINA_U elm_coords_finger_size_adjust(ELM_DAYSELECTOR_MAX, &min_w, 1, &min_h); edje_object_size_min_restricted_calc (wd->resize_obj, &min_w, &min_h, min_w, min_h); - elm_coords_finger_size_adjust(ELM_DAYSELECTOR_MAX, &min_w, 1, &min_h); evas_object_size_hint_min_set(obj, min_w, min_h); } diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 449e493..5a84d30 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -1745,8 +1745,6 @@ _item_realize(Elm_Gen_Item *it, if (sd->mode == ELM_LIST_COMPRESS) mw = sd->prev_viewport_w; edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh); - if (it->select_mode != ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) - elm_coords_finger_size_adjust(1, &mw, 1, &mh); it->item->w = it->item->minw = mw; it->item->h = it->item->minh = mh; it->item->mincalcd = EINA_TRUE; diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index 8371e52..282b77f 100644 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -984,8 +984,6 @@ _items_fix(Evas_Object *obj) mw = mw > ew ? mw : ew; mh = mh > eh ? mh : eh; */ - if (!it->is_separator) - elm_coords_finger_size_adjust(1, &mw, 1, &mh); evas_object_size_hint_min_set(VIEW(it), mw, mh); evas_object_show(VIEW(it)); } diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c index a6a08c2..5b19d98 100644 --- a/src/lib/elm_photo.c +++ b/src/lib/elm_photo.c @@ -41,7 +41,6 @@ _sizing_eval(Evas_Object *obj) elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); - elm_coords_finger_size_adjust(1, &minw, 1, &minh); maxw = minw; maxh = minh; evas_object_size_hint_min_set(obj, minw, minh); diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c index da253f1..9bee933 100644 --- a/src/lib/elm_radio.c +++ b/src/lib/elm_radio.c @@ -223,7 +223,6 @@ _elm_radio_elm_layout_sizing_eval(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED) elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); - elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_max_set(obj, -1, -1); } diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c index 3a0331c..3d0810d 100644 --- a/src/lib/elm_segment_control.c +++ b/src/lib/elm_segment_control.c @@ -51,7 +51,6 @@ _elm_segment_control_elm_layout_sizing_eval(Eo *obj, Elm_Segment_Control_Data *s elm_coords_finger_size_adjust(item_count, &minw, 1, &minh); edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); - elm_coords_finger_size_adjust(item_count, &minw, 1, &minh); evas_object_size_hint_min_get(obj, &w, &h); diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index 533503a..b69d8d8 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -606,7 +606,6 @@ _elm_slider_elm_layout_sizing_eval(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED) elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); - elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_max_set(obj, -1, -1); } diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c index 135f586..1ae00c7 100644 --- a/src/lib/elm_spinner.c +++ b/src/lib/elm_spinner.c @@ -451,7 +451,6 @@ _elm_spinner_elm_layout_sizing_eval(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED) elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); - elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_max_set(obj, -1, -1); } diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index f3a1f1a..95fbcf2 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -265,15 +265,12 @@ _items_size_fit(Evas_Object *obj, Evas_Coord *bl, Evas_Coord view) if (!it->separator && !it->object) elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh); - if (!it->separator && !it->object) - elm_coords_finger_size_adjust(1, &mw, 1, &mh); } else if (!more) { more = EINA_TRUE; elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(sd->VIEW(more_item), &mw, &mh, mw, mh); - elm_coords_finger_size_adjust(1, &mw, 1, &mh); } if (mw != -1 || mh != -1) @@ -1449,7 +1446,6 @@ _elm_toolbar_item_label_update(Elm_Toolbar_Item_Data *item) //the below function should be called before the calculation. edje_object_message_signal_process(VIEW(item)); edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh); - elm_coords_finger_size_adjust(1, &mw, 1, &mh); if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND) { if (sd->vertical) @@ -2395,8 +2391,6 @@ _item_new(Evas_Object *obj, //the below function should be called before the calculation. edje_object_message_signal_process(VIEW(it)); edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh); - if (!it->separator && !it->object) - elm_coords_finger_size_adjust(1, &mw, 1, &mh); if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND) { if (sd->vertical) @@ -2453,7 +2447,6 @@ _elm_toolbar_item_icon_update(Elm_Toolbar_Item_Data *item) //the below function should be called before the calculation. edje_object_message_signal_process(VIEW(item)); edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh); - elm_coords_finger_size_adjust(1, &mw, 1, &mh); if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND) { if (sd->vertical) --
