jaehwan pushed a commit to branch master.
commit 1eb8e6390018dde756d2267543c8e09e14e12939
Author: Jaehwan Kim <[email protected]>
Date: Tue Mar 5 16:46:27 2013 +0900
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
---
ChangeLog | 5 +++++
NEWS | 1 +
src/lib/elm_toolbar.c | 12 ++++++++++++
3 files changed, 18 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 4e6a542..e33eac5 100644
--- a/ChangeLog
+++ b/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/NEWS b/NEWS
index 6d3c14e..01ecdb9 100644
--- a/NEWS
+++ b/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/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 392f9b8..de71598 100644
--- a/src/lib/elm_toolbar.c
+++ b/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)
--
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
