summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_panel.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-03 09:06:10 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2019-09-03 09:15:31 +0200
commit121a437c4d48ec04f18d18589ff285b162684642 (patch)
tree420544b054197b7c23e3475f2f28d7548d5c75f9 /src/lib/elementary/efl_ui_panel.c
parentdc05cbbee85587d34eddc87fe45b3e26b05a353c (diff)
api: remove Efl.Ui.Scroll_Block
Summary: this now uses layout orient enum everywhere fix T7921 Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7921 Differential Revision: https://phab.enlightenment.org/D9804
Diffstat (limited to 'src/lib/elementary/efl_ui_panel.c')
-rw-r--r--src/lib/elementary/efl_ui_panel.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/lib/elementary/efl_ui_panel.c b/src/lib/elementary/efl_ui_panel.c
index 489569b..fc2ee66 100644
--- a/src/lib/elementary/efl_ui_panel.c
+++ b/src/lib/elementary/efl_ui_panel.c
@@ -281,7 +281,7 @@ _drawer_open(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
281 281
282 if (sd->freeze) 282 if (sd->freeze)
283 { 283 {
284 efl_ui_scrollable_movement_block_set(obj, EFL_UI_SCROLL_BLOCK_NONE); 284 efl_ui_scrollable_movement_block_set(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
285 sd->freeze = EINA_FALSE; 285 sd->freeze = EINA_FALSE;
286 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl"); 286 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
287 } 287 }
@@ -346,10 +346,10 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
346 { 346 {
347 if (horizontal) 347 if (horizontal)
348 efl_ui_scrollable_movement_block_set 348 efl_ui_scrollable_movement_block_set
349 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL); 349 (obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
350 else 350 else
351 efl_ui_scrollable_movement_block_set 351 efl_ui_scrollable_movement_block_set
352 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL); 352 (obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
353 sd->freeze = EINA_TRUE; 353 sd->freeze = EINA_TRUE;
354 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,hidden", "efl"); 354 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,hidden", "efl");
355 } 355 }
@@ -362,7 +362,7 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
362 if (sd->freeze) 362 if (sd->freeze)
363 { 363 {
364 efl_ui_scrollable_movement_block_set 364 efl_ui_scrollable_movement_block_set
365 (obj, EFL_UI_SCROLL_BLOCK_NONE); 365 (obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
366 sd->freeze = EINA_FALSE; 366 sd->freeze = EINA_FALSE;
367 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl"); 367 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
368 } 368 }
@@ -375,10 +375,10 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
375 { 375 {
376 if (horizontal) 376 if (horizontal)
377 efl_ui_scrollable_movement_block_set 377 efl_ui_scrollable_movement_block_set
378 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL); 378 (obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
379 else 379 else
380 efl_ui_scrollable_movement_block_set 380 efl_ui_scrollable_movement_block_set
381 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL); 381 (obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
382 sd->freeze = EINA_TRUE; 382 sd->freeze = EINA_TRUE;
383 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,hidden", "efl"); 383 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,hidden", "efl");
384 } 384 }
@@ -506,7 +506,7 @@ _timer_cb(void *data)
506 if (sd->freeze) 506 if (sd->freeze)
507 { 507 {
508 efl_ui_scrollable_movement_block_set 508 efl_ui_scrollable_movement_block_set
509 (obj, EFL_UI_SCROLL_BLOCK_NONE); 509 (obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
510 sd->freeze = EINA_FALSE; 510 sd->freeze = EINA_FALSE;
511 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl"); 511 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
512 evas_object_geometry_get(obj, NULL, NULL, &w, &h); 512 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
@@ -614,7 +614,7 @@ _on_mouse_move(void *data,
614 if (sd->timer && ((cur_y - sd->down_y) > finger_size)) 614 if (sd->timer && ((cur_y - sd->down_y) > finger_size))
615 { 615 {
616 efl_ui_scrollable_movement_block_set 616 efl_ui_scrollable_movement_block_set
617 (obj, EFL_UI_SCROLL_BLOCK_NONE); 617 (obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
618 sd->freeze = EINA_FALSE; 618 sd->freeze = EINA_FALSE;
619 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl"); 619 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
620 } 620 }
@@ -623,7 +623,7 @@ _on_mouse_move(void *data,
623 if (sd->timer && ((sd->down_y - cur_y) > finger_size)) 623 if (sd->timer && ((sd->down_y - cur_y) > finger_size))
624 { 624 {
625 efl_ui_scrollable_movement_block_set 625 efl_ui_scrollable_movement_block_set
626 (obj, EFL_UI_SCROLL_BLOCK_NONE); 626 (obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
627 sd->freeze = EINA_FALSE; 627 sd->freeze = EINA_FALSE;
628 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl"); 628 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
629 } 629 }
@@ -633,7 +633,7 @@ _on_mouse_move(void *data,
633 ((is_mirrored) && (sd->timer) && ((sd->down_x - cur_x) > finger_size))) 633 ((is_mirrored) && (sd->timer) && ((sd->down_x - cur_x) > finger_size)))
634 { 634 {
635 efl_ui_scrollable_movement_block_set 635 efl_ui_scrollable_movement_block_set
636 (obj, EFL_UI_SCROLL_BLOCK_NONE); 636 (obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
637 sd->freeze = EINA_FALSE; 637 sd->freeze = EINA_FALSE;
638 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl"); 638 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
639 } 639 }
@@ -643,7 +643,7 @@ _on_mouse_move(void *data,
643 (!is_mirrored && (sd->timer) && ((sd->down_x - cur_x) > finger_size))) 643 (!is_mirrored && (sd->timer) && ((sd->down_x - cur_x) > finger_size)))
644 { 644 {
645 efl_ui_scrollable_movement_block_set 645 efl_ui_scrollable_movement_block_set
646 (obj, EFL_UI_SCROLL_BLOCK_NONE); 646 (obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
647 sd->freeze = EINA_FALSE; 647 sd->freeze = EINA_FALSE;
648 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl"); 648 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
649 } 649 }
@@ -910,12 +910,12 @@ _efl_ui_panel_orient_set(Eo *obj, Efl_Ui_Panel_Data *sd, Efl_Ui_Panel_Orient ori
910 case EFL_UI_PANEL_ORIENT_TOP: 910 case EFL_UI_PANEL_ORIENT_TOP:
911 case EFL_UI_PANEL_ORIENT_BOTTOM: 911 case EFL_UI_PANEL_ORIENT_BOTTOM:
912 efl_ui_scrollable_movement_block_set 912 efl_ui_scrollable_movement_block_set
913 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL); 913 (obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
914 break; 914 break;
915 case EFL_UI_PANEL_ORIENT_LEFT: 915 case EFL_UI_PANEL_ORIENT_LEFT:
916 case EFL_UI_PANEL_ORIENT_RIGHT: 916 case EFL_UI_PANEL_ORIENT_RIGHT:
917 efl_ui_scrollable_movement_block_set 917 efl_ui_scrollable_movement_block_set
918 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL); 918 (obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
919 break; 919 break;
920 } 920 }
921 921
@@ -1059,10 +1059,10 @@ _anim_stop_cb(void *data EINA_UNUSED, const Efl_Event *event)
1059 { 1059 {
1060 if (horizontal) 1060 if (horizontal)
1061 efl_ui_scrollable_movement_block_set 1061 efl_ui_scrollable_movement_block_set
1062 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL); 1062 (obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
1063 else 1063 else
1064 efl_ui_scrollable_movement_block_set 1064 efl_ui_scrollable_movement_block_set
1065 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL); 1065 (obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
1066 sd->freeze = EINA_TRUE; 1066 sd->freeze = EINA_TRUE;
1067 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,hidden", "efl"); 1067 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,hidden", "efl");
1068 1068
@@ -1088,7 +1088,7 @@ _scroll_cb(void *data EINA_UNUSED, const Efl_Event *event_info EINA_UNUSED)
1088 if (sd->freeze) 1088 if (sd->freeze)
1089 { 1089 {
1090 efl_ui_scrollable_movement_block_set 1090 efl_ui_scrollable_movement_block_set
1091 (obj, EFL_UI_SCROLL_BLOCK_NONE); 1091 (obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
1092 sd->freeze = EINA_FALSE; 1092 sd->freeze = EINA_FALSE;
1093 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl"); 1093 elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
1094 } 1094 }
@@ -1108,13 +1108,13 @@ _efl_ui_panel_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bo
1108 case ELM_PANEL_ORIENT_BOTTOM: 1108 case ELM_PANEL_ORIENT_BOTTOM:
1109 case ELM_PANEL_ORIENT_TOP: 1109 case ELM_PANEL_ORIENT_TOP:
1110 efl_ui_scrollable_movement_block_set 1110 efl_ui_scrollable_movement_block_set
1111 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL); 1111 (obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
1112 break; 1112 break;
1113 1113
1114 case ELM_PANEL_ORIENT_RIGHT: 1114 case ELM_PANEL_ORIENT_RIGHT:
1115 case ELM_PANEL_ORIENT_LEFT: 1115 case ELM_PANEL_ORIENT_LEFT:
1116 efl_ui_scrollable_movement_block_set 1116 efl_ui_scrollable_movement_block_set
1117 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL); 1117 (obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
1118 break; 1118 break;
1119 } 1119 }
1120 1120
@@ -1136,13 +1136,13 @@ _efl_ui_panel_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bo
1136 case ELM_PANEL_ORIENT_BOTTOM: 1136 case ELM_PANEL_ORIENT_BOTTOM:
1137 case ELM_PANEL_ORIENT_TOP: 1137 case ELM_PANEL_ORIENT_TOP:
1138 efl_ui_scrollable_movement_block_set 1138 efl_ui_scrollable_movement_block_set
1139 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL); 1139 (obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
1140 break; 1140 break;
1141 1141
1142 case ELM_PANEL_ORIENT_RIGHT: 1142 case ELM_PANEL_ORIENT_RIGHT:
1143 case ELM_PANEL_ORIENT_LEFT: 1143 case ELM_PANEL_ORIENT_LEFT:
1144 efl_ui_scrollable_movement_block_set 1144 efl_ui_scrollable_movement_block_set
1145 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL); 1145 (obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
1146 break; 1146 break;
1147 } 1147 }
1148 1148
@@ -1275,12 +1275,12 @@ _efl_ui_panel_scrollable_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bool scrollabl
1275 case EFL_UI_PANEL_ORIENT_TOP: 1275 case EFL_UI_PANEL_ORIENT_TOP:
1276 case EFL_UI_PANEL_ORIENT_BOTTOM: 1276 case EFL_UI_PANEL_ORIENT_BOTTOM:
1277 efl_ui_scrollable_movement_block_set 1277 efl_ui_scrollable_movement_block_set
1278 (obj, EFL_UI_SCROLL_BLOCK_VERTICAL); 1278 (obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
1279 break; 1279 break;
1280 case EFL_UI_PANEL_ORIENT_LEFT: 1280 case EFL_UI_PANEL_ORIENT_LEFT:
1281 case EFL_UI_PANEL_ORIENT_RIGHT: 1281 case EFL_UI_PANEL_ORIENT_RIGHT:
1282 efl_ui_scrollable_movement_block_set 1282 efl_ui_scrollable_movement_block_set
1283 (obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL); 1283 (obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
1284 break; 1284 break;
1285 } 1285 }
1286 1286