Revert "ecore_wl2_window: modify configure_send function" 49/280549/1 accepted/tizen/unified/20220907.040716 submit/tizen/20220831.110301 submit/tizen/20220901.022025 submit/tizen/20220902.053033 submit/tizen/20220905.011007
authorDoyoun Kang <doyoun.kang@samsung.com>
Wed, 31 Aug 2022 10:58:32 +0000 (19:58 +0900)
committerDoyoun Kang <doyoun.kang@samsung.com>
Wed, 31 Aug 2022 10:59:19 +0000 (19:59 +0900)
This reverts commit 1585fc2f9cedeb57d75d9b73af2f95518ad70acf.

Change-Id: I106288ade013560b914930498278898724102a35

src/lib/ecore_wl2/ecore_wl2_window.c

index 433954e..9746724 100644 (file)
@@ -160,44 +160,35 @@ _ecore_wl2_window_configure_send(Ecore_Wl2_Window *win)
    ev->y = win->set_config.geometry.y;
 //
 
-// TIZEN_ONLY(220421/220822): modify event size
-   if (win->def_config.serial == win->req_config.serial)
+// TIZEN_ONLY(220421): modify event size
+   if (win->def_config.fullscreen || win->def_config.maximized)
      {
-        // this means that this function is called by internal function not display server's configure
-        ev->w = 0;
-        ev->h = 0;
+        ev->w = win->def_config.geometry.w;
+        ev->h = win->def_config.geometry.h;
      }
    else
      {
-        if (win->def_config.fullscreen || win->def_config.maximized)
+        if ((win->def_config.fullscreen != win->req_config.fullscreen) ||
+            (win->def_config.maximized != win->req_config.maximized))
           {
-             ev->w = win->def_config.geometry.w;
-             ev->h = win->def_config.geometry.h;
+             // this means that window unset fullscreen or maximized.
+             // use saved geometry
+             ev->w = win->saved.w;
+             ev->h = win->saved.h;
           }
         else
           {
-             if ((win->def_config.fullscreen != win->req_config.fullscreen) ||
-                 (win->def_config.maximized != win->req_config.maximized))
+             if (win->def_config.geometry.w || win->def_config.geometry.h)
                {
-                  // this means that window unset fullscreen or maximized.
-                  // use saved geometry
-                  ev->w = win->saved.w;
-                  ev->h = win->saved.h;
+                  ev->w = win->def_config.geometry.w;
+                  ev->h = win->def_config.geometry.h;
                }
              else
                {
-                  if (win->def_config.geometry.w || win->def_config.geometry.h)
-                    {
-                       ev->w = win->def_config.geometry.w;
-                       ev->h = win->def_config.geometry.h;
-                    }
-                  else
-                    {
-                       // this means that display server didn't consider client's size.
-                       // use client set_config size
-                       ev->w = win->set_config.geometry.w;
-                       ev->h = win->set_config.geometry.h;
-                    }
+                  // this means that display server didn't consider client's size.
+                  // use client set_config size
+                  ev->w = win->set_config.geometry.w;
+                  ev->h = win->set_config.geometry.h;
                }
           }
      }