From: Mike Blumenkrantz Date: Mon, 11 Mar 2019 15:30:22 +0000 (-0400) Subject: efl.ui.win: merge fullscreen+maximize events to use *,changed naming X-Git-Tag: submit/tizen/20190318.043110~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02648ba04cbda2f7d989a4ee0e51df6ed1c26cfa;p=platform%2Fupstream%2Fefl.git efl.ui.win: merge fullscreen+maximize events to use *,changed naming ref T7511 Reviewed-by: Xavi Artigas Differential Revision: https://phab.enlightenment.org/D8294 Change-Id: I2b63e05518a8054566e5ccbbecdb5f6eccc4a499 --- diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index d381be3..19219ed 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -2156,35 +2156,40 @@ _elm_win_state_change(Ecore_Evas *ee) #endif if (ch_fullscreen) { + Eina_Bool fullscreen; ELM_WIN_DATA_ALIVE_CHECK(obj, sd); _elm_win_frame_style_update(sd, 0, 1); + fullscreen = sd->fullscreen; if (sd->fullscreen) { - efl_event_callback_legacy_call - (obj, EFL_UI_WIN_EVENT_FULLSCREEN, NULL); + evas_object_smart_callback_call(obj, "fullscreen", NULL); } else { - efl_event_callback_legacy_call - (obj, EFL_UI_WIN_EVENT_UNFULLSCREEN, NULL); + evas_object_smart_callback_call(obj, "unfullscreen", NULL); } + efl_event_callback_call(obj, EFL_UI_WIN_EVENT_FULLSCREEN_CHANGED, (void*) (uintptr_t)fullscreen); } if (ch_maximized) { + Eina_Bool maximized; ELM_WIN_DATA_ALIVE_CHECK(obj, sd); _elm_win_frame_style_update(sd, 0, 1); + maximized = sd->maximized; if (sd->maximized) { - efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED, NULL); + evas_object_smart_callback_call(obj, "maximized", NULL); if (_elm_atspi_enabled()) efl_access_window_maximized_signal_emit(obj); } else { efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_UNMAXIMIZED, NULL); + evas_object_smart_callback_call(obj, "unmaximized", NULL); if (_elm_atspi_enabled()) efl_access_window_restored_signal_emit(obj); } + efl_event_callback_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED_CHANGED, (void*) (uintptr_t)maximized); } if (ch_profile) { diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index a886ddc..599b6da 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -928,10 +928,8 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac normal: void; [[Called when window is set to normal state]] stick @beta: void; [[Called when window is set as sticky]] unstick @beta: void; [[Called when window is no longer set as sticky]] - fullscreen: void; [[Called when window is set to fullscreen]] - unfullscreen: void; [[Called when window is no longer set to fullscreen]] - maximized: void; [[Called when window is set to maximized]] - unmaximized: void; [[Called when window is no longer set to maximized]] + fullscreen,changed: bool; [[Called when window is set to or from fullscreen]] + maximized,changed: bool; [[Called when window is set to or from maximized]] indicator,prop,changed @beta: void; [[Called when indicator is property changed]] win_rotation,changed: int; [[Called when window rotation is changed, sends current rotation in degrees]] profile,changed @beta: void; [[Called when profile is changed]]