summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJee-Yong Um <jc9.um@samsung.com>2017-01-12 16:32:02 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-01-12 16:32:05 -0800
commit3f6e8871e240d8895850d7bd18db7091a5f4662f (patch)
tree991bb3c2dbbd6d5177a3b4d9c756e7f87203d03a /src
parentbd241f6a389f78f63e58e3bc878c6a8e3e748fa2 (diff)
elm.hoversel: revert unnecessary item expansion & get proper size
Summary: The changes of previous patch (4ea7effe70423b5f88f98aea45a96582669aa280) are reverted, and item calculation is fixed correctly. The main reason why hoversel item has wrong size in screen rotation is that hover doesn't update geometry when the size of target object is changed. Test Plan: elementary_test -to hoversel Reviewers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D4556 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/elc_hoversel.c1
-rw-r--r--src/lib/elementary/elm_hover.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index e95ddc6c0e..0ecf69cc50 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -331,7 +331,6 @@ _resizing_eval(Evas_Object *obj, Elm_Hoversel_Data *sd)
331 } 331 }
332 } 332 }
333 } 333 }
334 if (ww < obj_w) ww = obj_w;
335 evas_object_size_hint_min_set(sd->spacer, ww, hh); 334 evas_object_size_hint_min_set(sd->spacer, ww, hh);
336} 335}
337 336
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 3f306ff2dc..f39711fee8 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -699,6 +699,8 @@ _elm_hover_target_set(Eo *obj, Elm_Hover_Data *sd, Evas_Object *target)
699 (sd->target, EVAS_CALLBACK_DEL, _target_del_cb, obj); 699 (sd->target, EVAS_CALLBACK_DEL, _target_del_cb, obj);
700 evas_object_event_callback_del_full 700 evas_object_event_callback_del_full
701 (sd->target, EVAS_CALLBACK_MOVE, _target_move_cb, obj); 701 (sd->target, EVAS_CALLBACK_MOVE, _target_move_cb, obj);
702 evas_object_event_callback_del_full
703 (sd->target, EVAS_CALLBACK_RESIZE, _target_move_cb, obj);
702 elm_widget_hover_object_set(sd->target, NULL); 704 elm_widget_hover_object_set(sd->target, NULL);
703 } 705 }
704 706
@@ -709,6 +711,8 @@ _elm_hover_target_set(Eo *obj, Elm_Hover_Data *sd, Evas_Object *target)
709 (sd->target, EVAS_CALLBACK_DEL, _target_del_cb, obj); 711 (sd->target, EVAS_CALLBACK_DEL, _target_del_cb, obj);
710 evas_object_event_callback_add 712 evas_object_event_callback_add
711 (sd->target, EVAS_CALLBACK_MOVE, _target_move_cb, obj); 713 (sd->target, EVAS_CALLBACK_MOVE, _target_move_cb, obj);
714 evas_object_event_callback_add
715 (sd->target, EVAS_CALLBACK_RESIZE, _target_move_cb, obj);
712 elm_widget_hover_object_set(target, obj); 716 elm_widget_hover_object_set(target, obj);
713 elm_layout_sizing_eval(obj); 717 elm_layout_sizing_eval(obj);
714 } 718 }