summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-10-19 17:06:38 -0700
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-12 10:15:03 +0100
commit1ff72418a677bc5a91ca2e2895bae44b009518bf (patch)
tree8a0081d395e3a367ec2c5551c305bdd4cf8cd29b
parent88bd1544efe09f68ae1fd2906db0c3563cd9ca14 (diff)
toolbar: limit number of min restricted calc to exacly what we need.
This change is the simplest I could do, but I think it would be better to move _item_theme_hook inside _item_new. This is a further attempt to fix T2777.
-rw-r--r--src/lib/elm_toolbar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index b5096b490..ef38744f2 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2432,7 +2432,6 @@ _item_new(Evas_Object *obj,
2432 2432
2433 evas_object_event_callback_add 2433 evas_object_event_callback_add
2434 (VIEW(it), EVAS_CALLBACK_RESIZE, _item_resize, obj); 2434 (VIEW(it), EVAS_CALLBACK_RESIZE, _item_resize, obj);
2435 _resizing_eval_item(it);
2436 if ((!sd->items) && (sd->select_mode == ELM_OBJECT_SELECT_MODE_ALWAYS)) 2435 if ((!sd->items) && (sd->select_mode == ELM_OBJECT_SELECT_MODE_ALWAYS))
2437 _item_select(it); 2436 _item_select(it);
2438 2437
@@ -3340,6 +3339,7 @@ _elm_toolbar_shrink_mode_set(Eo *obj, Elm_Toolbar_Data *sd, Elm_Toolbar_Shrink_M
3340 eo_do(obj, elm_interface_scrollable_policy_set 3339 eo_do(obj, elm_interface_scrollable_policy_set
3341 (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF)); 3340 (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF));
3342 sd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL); 3341 sd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL);
3342 _resizing_eval_item(sd->more_item);
3343 } 3343 }
3344 else if (shrink_mode == ELM_TOOLBAR_SHRINK_HIDE) 3344 else if (shrink_mode == ELM_TOOLBAR_SHRINK_HIDE)
3345 { 3345 {
@@ -3353,6 +3353,7 @@ _elm_toolbar_shrink_mode_set(Eo *obj, Elm_Toolbar_Data *sd, Elm_Toolbar_Shrink_M
3353 eo_do(obj, elm_interface_scrollable_policy_set 3353 eo_do(obj, elm_interface_scrollable_policy_set
3354 (ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF)); 3354 (ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF));
3355 sd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL); 3355 sd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL);
3356 _resizing_eval_item(sd->more_item);
3356 } 3357 }
3357 else 3358 else
3358 eo_do(obj, elm_interface_scrollable_policy_set 3359 eo_do(obj, elm_interface_scrollable_policy_set