[MPlayer-cvslog] r38163 - in trunk: Changelog gui/interface.c gui/ui/actions.c

[ib]

Author: ib
Date: Fri Jan 31 14:15:13 2020
New Revision: 38163

Log:
Fix wrong video window size.

The video window must only return to its initial size when fullscreen
playback ends. So pass a distinct argument for this case, because
pressing the fullscreen button to return to windowed mode also passes 0,
in which case the video window must return to the size of the video.

Modified:
   trunk/Changelog
   trunk/gui/interface.c
   trunk/gui/ui/actions.c

Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog	Tue Jan 21 00:52:42 2020	(r38162)
+++ trunk/Changelog	Fri Jan 31 14:15:13 2020	(r38163)
@@ -4,6 +4,9 @@ MPlayer
     * ffmpeg12vpdau is no longer supported by FFmpeg,
       provide separate ffmpeg1vpdau and ffmpeg2vdpau instead
 
+    GUI:
+    * Fix wrongly sized video window after leaving fullscreen mode
+
   1.4: "SubCounter" April 18, 2019
 
     Decoders, demuxers, streams:

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Tue Jan 21 00:52:42 2020	(r38162)
+++ trunk/gui/interface.c	Fri Jan 31 14:15:13 2020	(r38163)
@@ -1140,7 +1140,7 @@ int gui(int what, void *data)
                     wsWindowVisibility(&guiApp.videoWindow, wsShowWindow);
 
                 if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
-                    uiEvent(evFullScreen, False);
+                    uiEvent(evFullScreen, -1);
             } else {
                 wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
                 guiInfo.VideoWindow = False;

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Tue Jan 21 00:52:42 2020	(r38162)
+++ trunk/gui/ui/actions.c	Fri Jan 31 14:15:13 2020	(r38163)
@@ -439,7 +439,7 @@ play:
             uiFullScreen();
 
             if (!guiApp.videoWindow.isFullScreen)
-                wsWindowResize(&guiApp.videoWindow, iparam ? guiInfo.VideoWidth : guiApp.video.width, iparam ? guiInfo.VideoHeight : guiApp.video.height);
+                wsWindowResize(&guiApp.videoWindow, iparam >= 0 ? guiInfo.VideoWidth : guiApp.video.width, iparam >= 0 ? guiInfo.VideoHeight : guiApp.video.height);
         }
 
         if (guiApp.videoWindow.isFullScreen)