elm: Remove redundant finger size adjustment.

This is a successor of a54da8aab.

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 3083a7b8aee0eda1a6e14dcc22a123a7074f9a8d..1bba57d1435b359b6eb1f23fafb1a3b5d5038c4e 100644 (file)
--- 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 9077d5e49363239ad1d2ceabf15e399dd7721e28..27f38d05a66671a81b42b1ad4d62b47b45b681fa 100644 (file)
--- 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 72191a92347a1851bce097157674b86c430e1e39..066360d6710d540e1c51a08e671787568b0f8c04 100644 (file)
--- 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 2c7236de28b3aa792032ce56d84bcfec228b348a..1d834f827d5c3b3145c85d41a14cafbd9196b9a1 100644 (file)
--- 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 449e493bb6b362efa5a1174f5c12a862c37170f4..5a84d300fd198f88188662227a50bf3c98809c3a 100644 (file)
--- 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 8371e52bf4d674465476beffa39127a48cd7fa88..282b77fa52e0ffe275a410ecfdb3eb40a3d8f459 100644 (file)
--- 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 a6a08c248689bd63739438938af23646cbaba8f8..5b19d9870107a90d74720bf696b653e642db0578 100644 (file)
--- 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 da253f1f3aafc8b6f4f351ea86f121129b1fa1dd..9bee9336916a07e12f0b6c2b15b64ccfd0bb78b0 100644 (file)
--- 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 3a0331ce5e0be426bc0e82da8a49a6a0482ee724..3d0810d8e0362e2a0ddbc2e5b80e9bd6e5e2b6f7 100644 (file)
--- 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 533503a1e31b376d9772d3c4a8f8c508f1866992..b69d8d8c5eb2de269b0569b1e23e02ab52ba6b8f 100644 (file)
--- 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 135f5860284a09e2d44267bba39899e36625b312..1ae00c71cc610454208f0ec8d9e0742dba11b592 100644 (file)
--- 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 f3a1f1a89b028cb3b2b1c54c9c37ba9a882f5611..95fbcf203cd3b2fd8cba3bb5cc23b87f0edb8cc3 100644 (file)
--- 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)