[EGIT] [core/efl] master 02/03: ecore_wl2: Stop pretending to fully control minimized state

[Derek Foreman]

derekf pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=5a2c5479bf462882150597c465fbecf53c703bf1

commit 5a2c5479bf462882150597c465fbecf53c703bf1
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Wed Apr 11 11:36:53 2018 -0500

    ecore_wl2: Stop pretending to fully control minimized state
    
    Under wayland we can set minimized but not unset it, nor can we tell
    if it's been unset.  This means we can't cache the value, we need to
    make the protocol request any time ecore_wl2_window_iconified_set is
    called.
    
    ref T6834
---
 src/lib/ecore_wl2/ecore_wl2_private.h | 1 -
 src/lib/ecore_wl2/ecore_wl2_window.c  | 7 -------
 src/lib/ecore_wl2/window_v6.x         | 2 --
 3 files changed, 10 deletions(-)

diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h 
b/src/lib/ecore_wl2/ecore_wl2_private.h
index 09fc0abc1c..e47c3ffaae 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -156,7 +156,6 @@ typedef struct _Ecore_Wl2_Window_Configure_State
 {
    uint32_t serial;
    Eina_Rectangle geometry;
-   Eina_Bool minimized : 1;
    Eina_Bool maximized : 1;
    Eina_Bool fullscreen : 1;
    Eina_Bool focused : 1;
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c 
b/src/lib/ecore_wl2/ecore_wl2_window.c
index fad7c3462a..ac57ba2f84 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -225,7 +225,6 @@ _xdg_toplevel_cb_configure(void *data, struct xdg_toplevel 
*xdg_toplevel EINA_UN
    Ecore_Wl2_Window *win = data;
    uint32_t *s;
 
-   win->def_config.minimized = EINA_FALSE;
    win->def_config.maximized = EINA_FALSE;
    win->def_config.fullscreen = EINA_FALSE;
    win->def_config.focused = EINA_FALSE;
@@ -248,7 +247,6 @@ _xdg_toplevel_cb_configure(void *data, struct xdg_toplevel 
*xdg_toplevel EINA_UN
              break;
            case ZXDG_TOPLEVEL_V6_STATE_ACTIVATED:
              win->def_config.focused = EINA_TRUE;
-             win->def_config.minimized = EINA_FALSE;
            default:
              break;
           }
@@ -1092,15 +1090,10 @@ ecore_wl2_window_geometry_set(Ecore_Wl2_Window *window, 
int x, int y, int w, int
 EAPI void
 ecore_wl2_window_iconified_set(Ecore_Wl2_Window *window, Eina_Bool iconified)
 {
-   Eina_Bool prev;
-
    EINA_SAFETY_ON_NULL_RETURN(window);
 
-   prev = window->set_config.minimized;
    iconified = !!iconified;
-   if (prev == iconified) return;
 
-   window->set_config.minimized = iconified;
 
    if (iconified)
      {
diff --git a/src/lib/ecore_wl2/window_v6.x b/src/lib/ecore_wl2/window_v6.x
index 34a12d692e..28ff1b40c4 100644
--- a/src/lib/ecore_wl2/window_v6.x
+++ b/src/lib/ecore_wl2/window_v6.x
@@ -31,7 +31,6 @@ _zxdg_toplevel_cb_configure(void *data, struct 
zxdg_toplevel_v6 *zxdg_toplevel E
    Ecore_Wl2_Window *win = data;
    uint32_t *s;
 
-   win->def_config.minimized = EINA_FALSE;
    win->def_config.maximized = EINA_FALSE;
    win->def_config.fullscreen = EINA_FALSE;
    win->def_config.focused = EINA_FALSE;
@@ -54,7 +53,6 @@ _zxdg_toplevel_cb_configure(void *data, struct 
zxdg_toplevel_v6 *zxdg_toplevel E
              break;
            case ZXDG_TOPLEVEL_V6_STATE_ACTIVATED:
              win->def_config.focused = EINA_TRUE;
-             win->def_config.minimized = EINA_FALSE;
            default:
              break;
           }

--