Add edje_object_message_signal_process before edje_object_size_min_restricted_calc.

If the min size is changed by edje signal in edc, the the function should be called before the calculation.

This commit is related to 40dc2a25c72103c3b01620830e1bde964f96b2fa

diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 4e6a542..e33eac5 100644 (file)
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1100,3 +1100,8 @@
 2013-03-05 Jiyoun Park
 
         * Fix elm_conform didn't set size hint when keypad on.
+
+2013-03-05  Jaehwan Kim
+
+        * Add edje_object_message_signal_process before edje_object_size_min_restricted_calc.
+        If the min size is changed by edje signal in edc, the the function should be called before the calculation.

diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 6d3c14e..01ecdb9 100644 (file)
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -44,6 +44,7 @@ Additions:
    * Add the option about sending signals in content_pos_set.
    * Add omit feature to elm_index.
    * Add elm_transit_smooth_set(), elm_transit_smooth_get()
+   * Add edje_object_message_signal_process before edje_object_size_min_restricted_calc.
 
 Improvements:
 

diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c
index 392f9b8..de71598 100644 (file)
--- a/legacy/elementary/src/lib/elm_toolbar.c
+++ b/legacy/elementary/src/lib/elm_toolbar.c
@@ -885,6 +885,9 @@ _item_theme_hook(Evas_Object *obj,
    if (!it->separator && !it->object)
      elm_coords_finger_size_adjust(1, &mw, 1, &mh);
 
+   // If the min size is changed by edje signal in edc,
+   //the below function should be called before the calculation.
+   edje_object_message_signal_process(view);
    edje_object_size_min_restricted_calc(view, &mw, &mh, mw, mh);
    if (!it->separator && !it->object)
      elm_coords_finger_size_adjust(1, &mw, 1, &mh);
@@ -1050,6 +1053,9 @@ _elm_toolbar_item_label_update(Elm_Toolbar_Item *item)
      edje_object_signal_emit(VIEW(item), "elm,state,text,hidden", "elm");
 
    elm_coords_finger_size_adjust(1, &mw, 1, &mh);
+   // If the min size is changed by edje signal in edc,
+   //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)
@@ -1960,6 +1966,9 @@ _item_new(Evas_Object *obj,
    mw = mh = -1;
    if (!it->separator && !it->object)
      elm_coords_finger_size_adjust(1, &mw, 1, &mh);
+   // If the min size is changed by edje signal in edc,
+   //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);
@@ -2015,6 +2024,9 @@ _elm_toolbar_item_icon_update(Elm_Toolbar_Item *item)
        edje_object_signal_emit(VIEW(item), "elm,state,icon,hidden", "elm");
    evas_object_hide(old_icon);
    elm_coords_finger_size_adjust(1, &mw, 1, &mh);
+   // If the min size is changed by edje signal in edc,
+   //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)