ecore_evas/ecore_wl2_window: apply shadow area to border window

Revert "ecore_wl2_window: remove tizen only code for sending configure event"

Change-Id: If38baf76119528a7d0e0d7e1fb742d2f145632f0

diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index f3202f6..279c0c0 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -168,6 +168,16 @@ _ecore_wl2_window_configure_send(Ecore_Wl2_Window *win)
         ev->w = 0;
         ev->h = 0;
         size_type = 1;
+        if ((win->def_config.fullscreen || win->def_config.maximized) &&
+            ((win->def_config.fullscreen != win->set_config.fullscreen) ||
+             (win->def_config.maximized != win->set_config.maximized)))
+          {
+             // this means that user unset fullscreen or maximized.
+             // alpha window needs configure event to render normally.
+             ev->w = win->saved.w;
+             ev->h = win->saved.h;
+             size_type = 7;
+          }
      }
    else
      {
@@ -2187,6 +2197,14 @@ ecore_wl2_window_maximized_set_with_direction(Ecore_Wl2_Window *window, Ecore_Wl
           }
      }
 
+   /* TIZEN_ONLY(20190522): The window properties of ecore_evas are updated in
+    * _ecore_evas_wl_common_cb_window_configure.
+    * To call _ecore_evas_wl_common_cb_window_configure,
+    * ECORE_WL2_EVENT_WINDOW_CONFIGURE event is added.
+    * To add ECORE_WL2_EVENT_WINDOW_CONFIGURE event,
+    * _ecore_wl2_window_configure_send is called. */
+   _ecore_wl2_window_configure_send(window);
+   /* END of TIZEN_ONLY(20190522) */
    ecore_wl2_display_flush(window->display);
 }
 

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 5bc2197..9b370f5 100644 (file)
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -650,16 +650,14 @@ _ecore_evas_wl_common_wm_rot_manual_rotation_done_timeout(void *data)
 
 void _ecore_evas_framespace_get(Ecore_Evas *ee, int *fw, int *fh)
 {
-   int ww, wh, sw, sh, framew, frameh, cw, ch;
+   int ww, wh, framew, frameh, cw, ch;
 
    ecore_evas_geometry_get(ee, NULL, NULL, &ww, &wh);
 
-   sw = ee->shadow.l + ee->shadow.r;
-   sh = ee->shadow.t + ee->shadow.b;
    evas_output_framespace_get(ee->evas, NULL, NULL, &framew, &frameh);
 
-   cw = ww - (framew - sw);
-   ch = wh - (frameh - sh);
+   cw = ww - framew;
+   ch = wh - frameh;
 
    if (fw) *fw = ww - cw;
    if (fh) *fh = wh - ch;