elm: Remove redundant finger size adjustment.

This is a successor of a54da8aab.

Change-Id: I79b888cec49114cf49e2de1e4ee6a02c7a7cd98d
Origin: upstream

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 64c1c8922b7159ffa05522439cebadb18420fea5..110d4f4ac7343bc3bbe064573a2fa2c40aba9a0d 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 d08bb3a3bca207d3a8ea4b351818885dc7786d98..f28fd7359b2eb0a34d03dfa80dcae875ffa6b225 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 2e0c06ba9d7d0bc1a9fe11dd4af524da34804f24..4d85549850692e9ba1e661c0372646ad441e1d86 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -1775,8 +1775,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 60337148e1d4aeb17d7fadf5ed9ce0af52749f5e..831c1e88c20f1617328f130041221e20a78f0aeb 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -985,8 +985,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 d16a54cd16d7e91c6557fc16a81cc3aa0c63cc93..cc08d5f02b5200032e2ba84ae070adb0bd51cf31 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 559145669e4d29854413a1959a470418b52514f6..34be6aa157b749608f2a59e98bb6f384034f6e71 100644 (file)
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -236,7 +236,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 09824adbe9fc2247ada05ac4f2f9bbc0877f6fa5..0064d792ae96e3c2c8f2295c769444b333fc627e 100644 (file)
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -609,7 +609,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 f8007650f8566fb4b76959b8214c034b8703e0f4..8423cd4c6e10d4c19889650f66f4980f647e36bb 100644 (file)
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -458,7 +458,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 2e6ef22143fa59a18c434a89b39c3cba628679d1..b7b4bb745e07c402c269bdf585b8b1482bbfcb20 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)
@@ -1456,7 +1453,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)
@@ -2403,8 +2399,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)
@@ -2461,7 +2455,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)