[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] CVS: gnome-xine/src gtkvideo.c,1.118,1.119
From:       Darren Salt <dsalt () users ! sourceforge ! net>
Date:       2006-05-27 13:02:46
Message-ID: E1FjyRK-0003Zb-QY () sc8-pr-cvs10 ! sourceforge ! net
[Download RAW message or body]

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

Modified Files:
	gtkvideo.c 
Log Message:
Fixed a bug which prevented the video window from being shrunk.
This probably crept in when I added gtk_video_allow_shrink().


Index: gtkvideo.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/gtkvideo.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gtkvideo.c	17 May 2006 01:10:57 -0000	1.118
+++ gtkvideo.c	27 May 2006 13:02:42 -0000	1.119
@@ -458,8 +458,11 @@
 {
   gtk_widget_set_size_request (&gtv->widget, size->width, size->height);
   if (GTK_WIDGET_REALIZED(&gtv->widget) && gtv->widget.parent)
+  {
     gtk_window_resize ((GtkWindow *)gtk_widget_get_toplevel (&gtv->widget),
 		       GTK_VIDEO_MIN_WIDTH, 1); /* note controlling geometry */
+    gtk_video_allow_shrink (gtv);
+  }
 }
 
 static void gtv_do_rescale (GtkVideo *gtv)
@@ -830,6 +833,7 @@
 static void show_cb (GtkWidget *w, gpointer d)
 {
   gtk_widget_set_size_request (w, w->allocation.width, w->allocation.height);
+  gtk_video_allow_shrink (GTK_VIDEO (w));
 }
 
 static gboolean gtv_screen_blanker_cb (GtkVideo *gtv)
@@ -1299,6 +1303,7 @@
 				 gtv->priv->size.width, gtv->priv->size.height);
     gdk_flush ();
     gtv_unblock_timeout (gtv);
+    gtk_video_allow_shrink (gtv);
   }
 }
 
@@ -1366,6 +1371,7 @@
 
     do_pending_events (); /* events have been generated - process them */
     gtv_unblock_timeout (gtv); /* idle may be called early :-\ */
+    gtk_video_allow_shrink (gtv);
   }
 
   XUnlockDisplay (display);



-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]