diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-03-11 11:30:22 -0400 |
|---|---|---|
| committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-03-11 21:35:02 +0100 |
| commit | ca8e0d6eb72241931ee7d1810aa22b8cd09b6c8a (patch) | |
| tree | 9e8ca0cb08fa975e0b8dd65cf27cde49ac55cce9 | |
| parent | f7670ff5fd212d6db290cea4ac27ac4e8adb627e (diff) | |
| download | efl-ca8e0d6eb72241931ee7d1810aa22b8cd09b6c8a.tar.gz | |
efl.ui.win: merge fullscreen+maximize events to use *,changed naming
ref T7511
Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es>
Differential Revision: https://phab.enlightenment.org/D8294
| -rw-r--r-- | src/lib/elementary/efl_ui_win.c | 16 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_win.eo | 6 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index dde917663d..3467e6482c 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -1797,35 +1797,39 @@ _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_config->atspi_mode) 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_config->atspi_mode) 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 bc2e8e1917..1255b98d51 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -875,10 +875,8 @@ class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.W 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]] |