# HG changeset patch
# User ib
# Date 1358365124 0
# Node ID d1f84b21934058b3af81a9dda09422f38515301b
# Parent  782461b26312d19182b18b2db71853702ad0a6cc
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.

diff -r 782461b26312 -r d1f84b219340 gui/interface.c
--- a/gui/interface.c	Tue Jan 15 22:10:59 2013 +0000
+++ b/gui/interface.c	Wed Jan 16 19:38:44 2013 +0000
@@ -780,9 +780,6 @@
         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 @@
             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);
diff -r 782461b26312 -r d1f84b219340 gui/ui/main.c
--- a/gui/ui/main.c	Tue Jan 15 22:10:59 2013 +0000
+++ b/gui/ui/main.c	Wed Jan 16 19:38:44 2013 +0000
@@ -342,7 +342,6 @@
             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 @@
             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 @@
             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 @@
          {
           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 );