ecore_wl2_window: make TIZEN aux_hint interface work 40/189540/2
authorShinwoo Kim <cinoo.kim@samsung.com>
Tue, 18 Sep 2018 10:57:00 +0000 (19:57 +0900)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 19 Sep 2018 04:34:39 +0000 (04:34 +0000)
Upstream changed its condition before using aux_hint interface.
The tizen aux_hint interface did not work because of this.
The win->display->wl.efl_aux_hints is NULL on the tizen (downstream).
So there is not a logic change.

*tizen_fix

Change-Id: I767bca40e8605d7dfc46d550f93a349eeb846402

src/lib/ecore_wl2/ecore_wl2_window.c

index 8e00f7b..a5136b7 100644 (file)
@@ -2465,45 +2465,48 @@ EAPI void
 ecore_wl2_window_aux_hint_add(Ecore_Wl2_Window *win, int id, const char *hint, const char *val)
 {
    if (!win) return;
-   if ((!win->surface) || (!win->display->wl.efl_aux_hints)) return;
-
-   efl_aux_hints_add_aux_hint(win->display->wl.efl_aux_hints, win->surface, id, hint, val);
-   ecore_wl2_display_flush(win->display);
 
    // TIZEN_ONLY : To use tizen protocols
    if ((win->surface) && (win->display->wl.tz_policy))
      tizen_policy_add_aux_hint(win->display->wl.tz_policy, win->surface, id, hint, val);
    //
+
+   if ((!win->surface) || (!win->display->wl.efl_aux_hints)) return;
+
+   efl_aux_hints_add_aux_hint(win->display->wl.efl_aux_hints, win->surface, id, hint, val);
+   ecore_wl2_display_flush(win->display);
 }
 
 EAPI void
 ecore_wl2_window_aux_hint_change(Ecore_Wl2_Window *win, int id, const char *val)
 {
    if (!win) return;
-   if ((!win->surface) && (!win->display->wl.efl_aux_hints)) return;
-
-   efl_aux_hints_change_aux_hint(win->display->wl.efl_aux_hints, win->surface, id, val);
-   ecore_wl2_display_flush(win->display);
 
    // TIZEN_ONLY : To use tizen protocols
    if ((win->surface) && (win->display->wl.tz_policy))
      tizen_policy_change_aux_hint(win->display->wl.tz_policy, win->surface, id, val);
    //
+
+   if ((!win->surface) && (!win->display->wl.efl_aux_hints)) return;
+
+   efl_aux_hints_change_aux_hint(win->display->wl.efl_aux_hints, win->surface, id, val);
+   ecore_wl2_display_flush(win->display);
 }
 
 EAPI void
 ecore_wl2_window_aux_hint_del(Ecore_Wl2_Window *win, int id)
 {
    if (!win) return;
-   if ((!win->surface) || (!win->display->wl.efl_aux_hints)) return;
-
-   efl_aux_hints_del_aux_hint(win->display->wl.efl_aux_hints, win->surface, id);
-   ecore_wl2_display_flush(win->display);
 
    // TIZEN_ONLY : To use tizen protocols
    if ((win->surface) && (win->display->wl.tz_policy))
      tizen_policy_del_aux_hint(win->display->wl.tz_policy, win->surface, id);
    //
+
+   if ((!win->surface) || (!win->display->wl.efl_aux_hints)) return;
+
+   efl_aux_hints_del_aux_hint(win->display->wl.efl_aux_hints, win->surface, id);
+   ecore_wl2_display_flush(win->display);
 }
 
 EAPI void