summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaeun Choi <jaeun12.choi@samsung.com>2019-01-18 16:26:44 +0900
committerJaeun Choi <jaeun12.choi@samsung.com>2019-01-18 16:26:44 +0900
commit4d0289bb9f76dd798f0ed8fd8fce28e81cbbdabf (patch)
treedde54b16a161165a762642109004739b8e3b8fc2
parentc7e29cd1c1fa8fd6e8bb9f2a687c807d3b55b7ab (diff)
elm_panel: fix a bug in elm_scrollable_mode_set() function
when panel becomes scrollable, the function blocked scrolling assuming that the panel is hidden. this caused an issue case when panel becomes scrollable while it is open. this patch fixes the issue.
-rw-r--r--src/lib/elementary/elm_panel.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 1265e127ee..675227e654 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -1384,18 +1384,21 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable)
1384 elm_layout_content_set(sd->scr_ly, "elm.swallow.content", sd->bx); 1384 elm_layout_content_set(sd->scr_ly, "elm.swallow.content", sd->bx);
1385 if (sd->content) elm_widget_sub_object_add(sd->scr_ly, sd->content); 1385 if (sd->content) elm_widget_sub_object_add(sd->scr_ly, sd->content);
1386 1386
1387 switch (sd->orient) 1387 if (sd->hidden)
1388 { 1388 {
1389 case ELM_PANEL_ORIENT_TOP: 1389 switch (sd->orient)
1390 case ELM_PANEL_ORIENT_BOTTOM: 1390 {
1391 elm_interface_scrollable_movement_block_set 1391 case ELM_PANEL_ORIENT_TOP:
1392 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL); 1392 case ELM_PANEL_ORIENT_BOTTOM:
1393 break; 1393 elm_interface_scrollable_movement_block_set
1394 case ELM_PANEL_ORIENT_LEFT: 1394 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
1395 case ELM_PANEL_ORIENT_RIGHT: 1395 break;
1396 elm_interface_scrollable_movement_block_set 1396 case ELM_PANEL_ORIENT_LEFT:
1397 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL); 1397 case ELM_PANEL_ORIENT_RIGHT:
1398 break; 1398 elm_interface_scrollable_movement_block_set
1399 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
1400 break;
1401 }
1399 } 1402 }
1400 1403
1401 elm_interface_scrollable_single_direction_set 1404 elm_interface_scrollable_single_direction_set