Mercurial > mplayer.hg

changeset 33996:acf8545dc4b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove variable decoration in wsFullScreen(). It is needless, use win->Decorations together with win->isFullScreen instead.
author ib
date Thu, 08 Sep 2011 13:42:53 +0000
parents 9c2779f24077
children 68633e7c5e1e
files gui/wm/ws.c
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/wm/ws.c	Thu Sep 08 13:30:50 2011 +0000
+++ b/gui/wm/ws.c	Thu Sep 08 13:42:53 2011 +0000
@@ -929,8 +929,6 @@
 // ----------------------------------------------------------------------------------------------
 void wsFullScreen(wsTWindow *win)
 {
-    int decoration = 0;
-
     if (win->isFullScreen) {
         vo_x11_ewmh_fullscreen(win->WindowID, _NET_WM_STATE_REMOVE); // removes fullscreen state if wm supports EWMH
 
@@ -939,7 +937,6 @@
             win->Y      = win->OldY;
             win->Width  = win->OldWidth;
             win->Height = win->OldHeight;
-            decoration  = win->Decorations;
         }
 
         win->isFullScreen = False;
@@ -967,7 +964,7 @@
     }
 
     if (!(vo_fs_type & vo_wm_FULLSCREEN)) { // shouldn't be needed with EWMH fs
-        vo_x11_decoration(wsDisplay, win->WindowID, decoration);
+        vo_x11_decoration(wsDisplay, win->WindowID, win->Decorations && !win->isFullScreen);
         vo_x11_sizehint(win->X, win->Y, win->Width, win->Height, 0);
         vo_x11_setlayer(wsDisplay, win->WindowID, win->isFullScreen);