[xine-cvs] CVS: gnome-xine/src noskin_window.c,1.85,1.86

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv461/src

Modified Files:
	noskin_window.c 
Log Message:
Tie the full-screen toolbar position to the video window, not the X screen.

Index: noskin_window.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/noskin_window.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- noskin_window.c	11 Oct 2005 17:50:58 -0000	1.85
+++ noskin_window.c	11 Oct 2005 22:09:39 -0000	1.86
@@ -189,16 +189,20 @@
 
 static gint cw_height = 1;
 
-static gboolean window_fs_toolbar_move (void)
+static gboolean window_fs_toolbar_move (GdkEventConfigure *event)
 {
-  gtk_window_move (GTK_WINDOW(fs_toolbar), 0,
-		   fs_toolbar_at_top ? 1 : gdk_screen_height () - cw_height - 1);
+  int h = fs_toolbar_at_top
+	  ? 1
+	  : (event ? event->height : app->allocation.height) - cw_height - 1;
+  gtk_window_move (GTK_WINDOW(fs_toolbar),
+		   event ? event->x : app->allocation.x,
+		   (event ? event->y : app->allocation.y) + h);
   return FALSE;
 }
 
 static gboolean window_fs_toolbar_show_int (void)
 {
-  window_fs_toolbar_move ();
+  window_fs_toolbar_move (NULL);
   window_show (fs_toolbar, NULL);
   gtk_window_stick (GTK_WINDOW(fs_toolbar));
   return FALSE;
@@ -230,8 +234,7 @@
 void window_fs_toolbar_position (gboolean top)
 {
   fs_toolbar_at_top = top;
-  gtk_window_move (GTK_WINDOW(fs_toolbar),
-		   0, top ? 1 : gdk_screen_height () - cw_height - 1);
+  window_fs_toolbar_move (NULL);
   ui_set_status (UI_FS_TOOLBAR_POS);
 }
 
@@ -511,7 +514,7 @@
   {
 #ifdef HAVE_XRANDR
     if (fs_toolbar_visible)
-      window_fs_toolbar_move ();
+      window_fs_toolbar_move (event);
     window_fs_toolbar_set_geometry ();
     gtk_window_resize (GTK_WINDOW (fs_toolbar), event->width,
 		       fs_toolbar->allocation.height);