[Xfce4-commits] [xfce/xfwm4] 06/07: moveresize: Restore window state on move

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   l   i   v   i   e   r       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfwm4.

commit f3994308b5513899222738326fba01aa2a93ac2c
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Sun Apr 5 17:18:14 2020 +0200

    moveresize: Restore window state on move
    
    Bug: 16348
    
    When moving a maximized window, we would not restore the actual window
    state.
    
    With client-side decorations, that prevents shadows from being enabled.
    
    Make sure to restore the actual client state when moving.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/compositor.c |  1 +
 src/moveresize.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index cb3ad94..a7c182d 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1136,6 +1136,7 @@ choose_glx_settings (ScreenInfo *screen_info)
     g_return_val_if_fail (screen_info != NULL, FALSE);
     TRACE ("entering");
 
+    glEnable (GL_TEXTURE_2D);
     configs = glXChooseFBConfig (myScreenGetXDisplay (screen_info),
                                  screen_info->screen,
                                  visual_attribs,
diff --git a/src/moveresize.c b/src/moveresize.c
index e70045d..3e505e3 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -1040,6 +1040,11 @@ clientMoveEventFilter (XfwmEvent *event, gpointer data)
             {
                 passdata->move_resized = TRUE;
 
+                if (!screen_info->params->box_move)
+                {
+                    clientSetNetState (c);
+                }
+
                 /* to keep the distance from the edges of the window proportional. */
                 passdata->ox = c->x;
                 passdata->mx = frameExtentX (c) + passdata->pxratio * frameExtentWidth (c);
@@ -1259,11 +1264,7 @@ clientMove (Client * c, XfwmEventButton *event)
     /* Set window opacity to its original value */
     clientSetOpacity (c, c->opacity, OPACITY_MOVE, 0);
 
-    /* Update state if changed */
-    if (passdata.cancel_flags != c->flags)
-    {
-        clientSetNetState (c);
-    }
+    clientSetNetState (c);
 
     wc.x = c->x;
     wc.y = c->y;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.