summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJee-Yong Um <jc9.um@samsung.com>2015-10-26 01:27:02 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-10-26 01:47:46 +0100
commit7e1d1d19e9398225f1d546b20fc6d7c2998b0abc (patch)
treed4903702368e87a4c2f2213f513777203876712e /src/lib
parentaa7a0142ba6e7c48916505f85610b50529ceaa90 (diff)
hoversel: expands scrollable hoversel as large as it can
Summary: In D2063, "max_size" data item is added to limit the number of items to show at a time when hoversel is expanded. However, it limits the number of items too few, so makes scrollable function useless. This patch removes limitation of hoversel size with pixels, but if it needs, developers can set the limitation yet. (By theme customization) Test Plan: elementary_test "hoversel" click the second hoversel Reviewers: DaveMDS, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3223 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elc_hoversel.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 4f827dca5..a922fbea5 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -254,11 +254,10 @@ _resizing_eval(Evas_Object *obj, Elm_Hoversel_Data *sd)
254 254
255 if (sd->horizontal) 255 if (sd->horizontal)
256 { 256 {
257 ww = MIN(box_w, max_size); 257 ww = (max_size > 0) ? MIN(box_w, max_size) : box_w ;
258 hh = box_h; 258 hh = box_h;
259 259
260 evas_object_size_hint_min_set(sd->spacer, ww, hh); 260 evas_object_size_hint_min_set(sd->spacer, ww, hh);
261 evas_object_size_hint_max_set(sd->spacer, max_size, -1);
262 261
263 if (!sd->last_location) 262 if (!sd->last_location)
264 sd->last_location = elm_hover_best_content_location_get(sd->hover, ELM_HOVER_AXIS_HORIZONTAL); 263 sd->last_location = elm_hover_best_content_location_get(sd->hover, ELM_HOVER_AXIS_HORIZONTAL);
@@ -266,10 +265,9 @@ _resizing_eval(Evas_Object *obj, Elm_Hoversel_Data *sd)
266 else 265 else
267 { 266 {
268 ww = box_w; 267 ww = box_w;
269 hh = MIN(box_h, max_size); 268 hh = (max_size > 0) ? MIN(box_h, max_size) : box_h ;
270 269
271 evas_object_size_hint_min_set(sd->spacer, ww, hh); 270 evas_object_size_hint_min_set(sd->spacer, ww, hh);
272 evas_object_size_hint_max_set(sd->spacer, -1, max_size);
273 271
274 if (!sd->last_location) 272 if (!sd->last_location)
275 sd->last_location = elm_hover_best_content_location_get(sd->hover, ELM_HOVER_AXIS_VERTICAL); 273 sd->last_location = elm_hover_best_content_location_get(sd->hover, ELM_HOVER_AXIS_VERTICAL);