summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2016-07-28 15:18:07 +0530
committerAmitesh Singh <amitesh.sh@samsung.com>2016-07-28 15:22:07 +0530
commitba060fe93236da37e4c8bbd84c1bcf58e27979d6 (patch)
treeb34a8cca169d81a85c89aa0679fdf6c2a6f924a4
parent28aa0ba79fc10920c89827dda94ead8f3bde9d28 (diff)
entry: allow force recalc on "size,eval" "elm" signal
Summary: In some use cases, font (style) of elm.text in elm entry is changed on focus and unfocus. user must send "size,eval",elm signal to entry to force recalc, but this was not happening. This patch fixes that issue. fixes T4233 Reviewers: tasn, herdsman, raster Subscribers: cedric, seoz, jpeg Maniphest Tasks: T4233 Differential Revision: https://phab.enlightenment.org/D4196
-rw-r--r--src/lib/elementary/elm_entry.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 87c555f..ead6be5 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3625,6 +3625,15 @@ _end_handler_mouse_move_cb(void *data,
3625 _magnifier_move(data); 3625 _magnifier_move(data);
3626} 3626}
3627 3627
3628static void
3629_entry_on_size_evaluate_signal(void *data,
3630 Evas_Object *obj EINA_UNUSED,
3631 const char *emission EINA_UNUSED,
3632 const char *source EINA_UNUSED)
3633{
3634 elm_entry_calc_force(data);
3635}
3636
3628EOLIAN static void 3637EOLIAN static void
3629_elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv) 3638_elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv)
3630{ 3639{
@@ -3785,6 +3794,10 @@ _elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv)
3785 3794
3786 if (_elm_config->desktop_entry) 3795 if (_elm_config->desktop_entry)
3787 priv->sel_handler_disabled = EINA_TRUE; 3796 priv->sel_handler_disabled = EINA_TRUE;
3797
3798 edje_object_signal_callback_add
3799 (priv->entry_edje, "size,eval", "elm",
3800 _entry_on_size_evaluate_signal, obj);
3788} 3801}
3789 3802
3790static void 3803static void
@@ -3829,6 +3842,10 @@ _elm_entry_efl_canvas_group_group_del(Eo *obj, Elm_Entry_Data *sd)
3829 if (sd->auto_save) _save_do(obj); 3842 if (sd->auto_save) _save_do(obj);
3830 } 3843 }
3831 3844
3845 edje_object_signal_callback_del_full
3846 (sd->entry_edje, "size,eval", "elm",
3847 _entry_on_size_evaluate_signal, obj);
3848
3832 if (sd->scroll) 3849 if (sd->scroll)
3833 elm_interface_scrollable_content_viewport_resize_cb_set(obj, NULL); 3850 elm_interface_scrollable_content_viewport_resize_cb_set(obj, NULL);
3834 3851