summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_panel.c
diff options
context:
space:
mode:
authorJaeun Choi <jaeun12.choi@samsung.com>2019-04-08 18:35:57 +0900
committerJaeun Choi <jaeun12.choi@samsung.com>2019-04-08 18:48:34 +0900
commit998e9a8f68296eeba25ce0c155314fe8c41f6773 (patch)
treec17626417e553e92c4fe9ea3ffc8590a459c17e4 /src/lib/elementary/efl_ui_panel.c
parentdc1e1a652cfd0c867b175aa7e5c13c73796ad1bd (diff)
elm_panel/efl_ui_panel: disable scrolling when obj is disabled
panels were still scrollable while disabled. this patch fixes it.
Diffstat (limited to 'src/lib/elementary/efl_ui_panel.c')
-rw-r--r--src/lib/elementary/efl_ui_panel.c30
1 files changed, 30 insertions, 0 deletions
diff --git a/src/lib/elementary/efl_ui_panel.c b/src/lib/elementary/efl_ui_panel.c
index efab363..9e8e4c5 100644
--- a/src/lib/elementary/efl_ui_panel.c
+++ b/src/lib/elementary/efl_ui_panel.c
@@ -1165,6 +1165,21 @@ _efl_ui_panel_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bo
1165 { 1165 {
1166 if (disabled && sd->callback_added) 1166 if (disabled && sd->callback_added)
1167 { 1167 {
1168 switch (sd->orient)
1169 {
1170 case ELM_PANEL_ORIENT_BOTTOM:
1171 case ELM_PANEL_ORIENT_TOP:
1172 elm_interface_scrollable_movement_block_set
1173 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
1174 break;
1175
1176 case ELM_PANEL_ORIENT_RIGHT:
1177 case ELM_PANEL_ORIENT_LEFT:
1178 elm_interface_scrollable_movement_block_set
1179 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
1180 break;
1181 }
1182
1168 evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_DOWN, 1183 evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_DOWN,
1169 _on_mouse_down); 1184 _on_mouse_down);
1170 evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_MOVE, 1185 evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_MOVE,
@@ -1178,6 +1193,21 @@ _efl_ui_panel_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bo
1178 } 1193 }
1179 else if (!disabled && !sd->callback_added) 1194 else if (!disabled && !sd->callback_added)
1180 { 1195 {
1196 switch (sd->orient)
1197 {
1198 case ELM_PANEL_ORIENT_BOTTOM:
1199 case ELM_PANEL_ORIENT_TOP:
1200 elm_interface_scrollable_movement_block_set
1201 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
1202 break;
1203
1204 case ELM_PANEL_ORIENT_RIGHT:
1205 case ELM_PANEL_ORIENT_LEFT:
1206 elm_interface_scrollable_movement_block_set
1207 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
1208 break;
1209 }
1210
1181 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, 1211 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN,
1182 _on_mouse_down, sd); 1212 _on_mouse_down, sd);
1183 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE, 1213 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE,