e_client/e_policy/e_zone: change code to use ec->maximize_type instead of e_config...

Change-Id: I713731fb129336873caba9a0cfe74de1e4e943b9

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 8fe284f877d6ac83c0ee447c36800e9f198e2a2b..6101354ee3ea1c79a49e0b9dc00f38439ded160a 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -6256,7 +6256,7 @@ e_client_unfullscreen(E_Client *ec)
                                            ec->saved.w, ec->saved.h);
 
    if (ec->saved.maximized)
-     e_client_maximize(ec, (e_config->maximize_policy & E_MAXIMIZE_TYPE) |
+     e_client_maximize(ec, (ec->maximize_type & E_MAXIMIZE_TYPE) |
                        ec->saved.maximized);
 
    e_client_layer_set(ec, ec->saved.layer);

diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c
index 9664a8f551e9fcc339680e75ef3cf442a6d99d8e..8e2240c173aef41181f15937b7985107270f4d8e 100644 (file)
--- a/src/bin/e_comp_wl_shell.c
+++ b/src/bin/e_comp_wl_shell.c
@@ -575,7 +575,7 @@ _e_shell_surface_cb_maximized_set(struct wl_client *client EINA_UNUSED, struct w
      {
         unsigned int edges = 0;
 
-        e_client_maximize(ec, ((e_config->maximize_policy & E_MAXIMIZE_TYPE) |
+        e_client_maximize(ec, ((ec->maximize_type & E_MAXIMIZE_TYPE) |
                                E_MAXIMIZE_BOTH));
 
         edges = (WL_SHELL_SURFACE_RESIZE_TOP | WL_SHELL_SURFACE_RESIZE_LEFT);
@@ -1127,7 +1127,7 @@ _e_xdg_shell_surface_cb_maximized_set(struct wl_client *client EINA_UNUSED, stru
    if (!ec->lock_user_maximize)
      {
         e_client_maximize(ec,
-                          ((e_config->maximize_policy & E_MAXIMIZE_TYPE) | E_MAXIMIZE_BOTH));
+                          ((ec->maximize_type & E_MAXIMIZE_TYPE) | E_MAXIMIZE_BOTH));
      }
 }
 

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index a811ff5a9f2b4066a2149650e451302b4914f82d..9691e0963f61ad24ad1733d0d5438e2f7eff8f87 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -4893,8 +4893,11 @@ _tzsh_iface_cb_srv_create(struct wl_client *client, struct wl_resource *res_tzsh
                                   tzsh_srv,
                                   _tzsh_cb_srv_destroy);
 
-   if (tzsh_srv->ec->maximized)
-     e_client_maximize(ec, E_MAXIMIZE_FULLSCREEN | E_MAXIMIZE_BOTH);
+   if (tzsh_srv->ec && tzsh_srv->ec->maximized)
+     {
+        tzsh_srv->ec->maximize_type = E_MAXIMIZE_TYPE_FULLSCREEN;
+        e_client_maximize(tzsh_srv->ec, tzsh_srv->ec->maximize_type | E_MAXIMIZE_BOTH);
+     }
 
    if (role == TZSH_SRV_ROLE_QUICKPANEL_SYSTEM_DEFAULT)
      e_service_quickpanel_client_add(tzsh_srv->ec, E_SERVICE_QUICKPANEL_TYPE_SYSTEM_DEFAULT);

diff --git a/src/bin/e_xdg_shell_v6.c b/src/bin/e_xdg_shell_v6.c
index 11d3758ccbdb4264cc76cc1ea61374831c02f192..9c21489920cb03cb2b5d2fae8abd6eadaa9f4285 100644 (file)
--- a/src/bin/e_xdg_shell_v6.c
+++ b/src/bin/e_xdg_shell_v6.c
@@ -820,7 +820,7 @@ _e_xdg_toplevel_cb_maximized_set(struct wl_client *client, struct wl_resource *r
           {
              e_client_layout_apply(ec, EINA_FALSE);
 
-             max = (e_config->maximize_policy & E_MAXIMIZE_TYPE) | E_MAXIMIZE_BOTH;
+             max = ec->maximize_type | E_MAXIMIZE_BOTH;
              e_client_maximize(ec, max);
           }
      }

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index b289e5f112676d128a760af9fd761529e1813a4e..fe22bf2a19e8a0a20669d1279a919b1e8e88c7a2 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -1204,7 +1204,7 @@ _e_zone_cb_hook_client_unfullscreen(void *d, E_Client *ec)
                                            ec->saved.w, ec->saved.h);
 
    if (ec->saved.maximized)
-     e_client_maximize(ec, (e_config->maximize_policy & E_MAXIMIZE_TYPE) |
+     e_client_maximize(ec, (ec->maximize_type & E_MAXIMIZE_TYPE) |
                        ec->saved.maximized);
 
    e_client_layer_set(ec, ec->saved.layer);