discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=10bd6e5fcc16eaf88dc49a66356aede1fc5ff098

commit 10bd6e5fcc16eaf88dc49a66356aede1fc5ff098
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Apr 11 14:38:03 2016 -0400

    handle maximize_anims_disabled for client-side maximize toggles
    
    fix T3434
---
 src/modules/wl_desktop_shell/e_mod_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c 
b/src/modules/wl_desktop_shell/e_mod_main.c
index 99d1f96..5fb289a 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -957,7 +957,7 @@ _e_xdg_shell_surface_cb_maximized_set(struct wl_client 
*client EINA_UNUSED, stru
      }
 
    if (ec->lock_user_maximize) return;
-   if (e_config->window_maximize_animate)
+   if (e_config->window_maximize_animate && (!ec->maximize_anims_disabled))
      w = ec->w, h = ec->h;
    else
      {
@@ -990,7 +990,7 @@ _e_xdg_shell_surface_cb_maximized_unset(struct wl_client 
*client EINA_UNUSED, st
 
    if (ec->lock_user_maximize) return;
    ec->comp_data->max = (e_config->maximize_policy & E_MAXIMIZE_TYPE) | 
E_MAXIMIZE_BOTH;
-   if (e_config->window_maximize_animate)
+   if (e_config->window_maximize_animate && (!ec->maximize_anims_disabled))
      w = ec->w, h = ec->h;
    else
      w = ec->saved.w, h = ec->saved.h;

-- 


Reply via email to