summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 7258c5f..bddf5bf 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -927,10 +927,10 @@ _elm_win_resize_job(void *data)
927 927
928 if (sd->main_menu) 928 if (sd->main_menu)
929 { 929 {
930 int mx, my; 930 Eina_Position2D pos;
931 931
932 efl_gfx_position_get(sd->main_menu, &mx, &my); 932 pos = efl_gfx_position_get(sd->main_menu);
933 elm_menu_move(sd->main_menu, mx, my); 933 elm_menu_move(sd->main_menu, pos.x, pos.y);
934 } 934 }
935 935
936 sd->response++; 936 sd->response++;
@@ -2922,17 +2922,17 @@ _elm_win_obj_intercept_show(void *data,
2922} 2922}
2923 2923
2924EOLIAN static void 2924EOLIAN static void
2925_efl_ui_win_efl_gfx_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, Evas_Coord y) 2925_efl_ui_win_efl_gfx_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Position2D pos)
2926{ 2926{
2927 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x, y)) 2927 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
2928 return; 2928 return;
2929 2929
2930 if (sd->img_obj) 2930 if (sd->img_obj)
2931 { 2931 {
2932 if ((x != sd->screen.x) || (y != sd->screen.y)) 2932 if ((pos.x != sd->screen.x) || (pos.y != sd->screen.y))
2933 { 2933 {
2934 sd->screen.x = x; 2934 sd->screen.x = pos.x;
2935 sd->screen.y = y; 2935 sd->screen.y = pos.y;
2936 efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_MOVE, NULL); 2936 efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_MOVE, NULL);
2937 } 2937 }
2938 goto super_skip; 2938 goto super_skip;
@@ -2942,19 +2942,19 @@ _efl_ui_win_efl_gfx_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, Eva
2942 if (!sd->response) 2942 if (!sd->response)
2943 { 2943 {
2944 sd->req_xy = EINA_TRUE; 2944 sd->req_xy = EINA_TRUE;
2945 sd->req_x = x; 2945 sd->req_x = pos.x;
2946 sd->req_y = y; 2946 sd->req_y = pos.y;
2947 TRAP(sd, move, x, y); 2947 TRAP(sd, move, pos.x, pos.y);
2948 } 2948 }
2949 if (!ecore_evas_override_get(sd->ee)) goto super_skip; 2949 if (!ecore_evas_override_get(sd->ee)) goto super_skip;
2950 } 2950 }
2951 2951
2952 efl_gfx_position_set(efl_super(obj, MY_CLASS), x, y); 2952 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
2953 2953
2954 if (ecore_evas_override_get(sd->ee)) 2954 if (ecore_evas_override_get(sd->ee))
2955 { 2955 {
2956 sd->screen.x = x; 2956 sd->screen.x = pos.x;
2957 sd->screen.y = y; 2957 sd->screen.y = pos.y;
2958 efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_MOVE, NULL); 2958 efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_MOVE, NULL);
2959 } 2959 }
2960 if (sd->frame_obj) 2960 if (sd->frame_obj)
@@ -2963,13 +2963,13 @@ _efl_ui_win_efl_gfx_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, Eva
2963 /* TODO */ 2963 /* TODO */
2964 /* ecore_wl_window_update_location(sd->wl.win, x, y); */ 2964 /* ecore_wl_window_update_location(sd->wl.win, x, y); */
2965#endif 2965#endif
2966 sd->screen.x = x; 2966 sd->screen.x = pos.x;
2967 sd->screen.y = y; 2967 sd->screen.y = pos.y;
2968 } 2968 }
2969 if (sd->img_obj) 2969 if (sd->img_obj)
2970 { 2970 {
2971 sd->screen.x = x; 2971 sd->screen.x = pos.x;
2972 sd->screen.y = y; 2972 sd->screen.y = pos.y;
2973 } 2973 }
2974 2974
2975 return; 2975 return;
@@ -2979,7 +2979,7 @@ super_skip:
2979 * Ugly code flow: legacy code had an early return in smart_move, ie. 2979 * Ugly code flow: legacy code had an early return in smart_move, ie.
2980 * evas object move would be processed but smart object move would be 2980 * evas object move would be processed but smart object move would be
2981 * aborted. This super call tries to simulate that. */ 2981 * aborted. This super call tries to simulate that. */
2982 efl_gfx_position_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), x, y); 2982 efl_gfx_position_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), pos);
2983} 2983}
2984 2984
2985EOLIAN static void 2985EOLIAN static void