[MPlayer-cvslog] r35757 - in trunk/gui: interface.c ui/main.c

[ib]

Author: ib
Date: Wed Jan 16 20:38:44 2013
New Revision: 35757

Log:
Don't unnecessarily and annoyingly move the video window.

So far, this has been done at the start and end of a video (in
non-fullscreen mode) as well as when selecting half, normal or
double size of the video.

Don't position the video window to the values given in the skin file,
because the user might have moved it in the meantime, so just let it
where it currently is.

This closes Bugzilla #1355.

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/main.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Tue Jan 15 23:10:59 2013	(r35756)
+++ trunk/gui/interface.c	Wed Jan 16 20:38:44 2013	(r35757)
@@ -780,9 +780,6 @@ int gui(int what, void *data)
         if (!guiApp.videoWindow.isFullScreen || !guiApp.videoWindow.Mapped) {
             if (!guiApp.videoWindow.isFullScreen)
                 wsResizeWindow(&guiApp.videoWindow, guiInfo.VideoWidth, guiInfo.VideoHeight);
-
-            wsMoveWindow(&guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y);
-
             if (!guiApp.videoWindow.Mapped)
                 wsVisibleWindow(&guiApp.videoWindow, wsShowWindow);
         }
@@ -861,10 +858,8 @@ int gui(int what, void *data)
             if (gtkShowVideoWindow) {
                 guiInfo.VideoWindow = True;
 
-                if (!guiApp.videoWindow.isFullScreen) {
+                if (!guiApp.videoWindow.isFullScreen)
                     wsResizeWindow(&guiApp.videoWindow, guiApp.video.width, guiApp.video.height);
-                    wsMoveWindow(&guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y);
-                }
 
                 if (!guiApp.videoWindow.Mapped)
                     wsVisibleWindow(&guiApp.videoWindow, wsShowWindow);

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Tue Jan 15 23:10:59 2013	(r35756)
+++ trunk/gui/ui/main.c	Wed Jan 16 20:38:44 2013	(r35757)
@@ -342,7 +342,6 @@ NoPause:
             uiFullScreen();
            }
           wsResizeWindow( &guiApp.videoWindow, guiInfo.VideoWidth / 2, guiInfo.VideoHeight / 2 );
-          wsMoveWindow( &guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y );
           btnSet( evFullScreen,btnReleased );
          }
         break;
@@ -354,7 +353,6 @@ NoPause:
             uiFullScreen();
            }
           wsResizeWindow( &guiApp.videoWindow, guiInfo.VideoWidth * 2, guiInfo.VideoHeight * 2 );
-          wsMoveWindowWithin( &guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y );
           btnSet( evFullScreen,btnReleased );
          }
         break;
@@ -366,7 +364,6 @@ NoPause:
             uiFullScreen();
            }
           wsResizeWindow( &guiApp.videoWindow, guiInfo.VideoWidth, guiInfo.VideoHeight );
-          wsMoveWindow( &guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y );
           btnSet( evFullScreen,btnReleased );
 	  break;
          } else if ( !guiApp.videoWindow.isFullScreen ) break;
@@ -375,10 +372,7 @@ NoPause:
          {
           uiFullScreen();
           if ( !guiApp.videoWindow.isFullScreen )
-           {
             wsResizeWindow( &guiApp.videoWindow, iparam ? guiInfo.VideoWidth : guiApp.video.width, iparam ? guiInfo.VideoHeight : guiApp.video.height );
-            wsMoveWindow( &guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y );
-           }
          }
 	if ( guiApp.videoWindow.isFullScreen ) btnSet( evFullScreen,btnPressed );
 	 else btnSet( evFullScreen,btnReleased );