]> git.sesse.net Git - vlc/commitdiff
* Fixed Mac OS X resizing.
authorChristophe Massiot <massiot@videolan.org>
Sat, 18 May 2002 18:48:24 +0000 (18:48 +0000)
committerChristophe Massiot <massiot@videolan.org>
Sat, 18 May 2002 18:48:24 +0000 (18:48 +0000)
plugins/macosx/vout_macosx.m
plugins/macosx/vout_qdview.m
plugins/macosx/vout_vlc_wrapper.h
plugins/macosx/vout_vlc_wrapper.m

index 910061a3f78b98cac1eaed8aa1b377e3aa9e3e0c..995eb22c043a2d222ea4d8261651b20bba418e56 100644 (file)
@@ -316,15 +316,6 @@ static void vout_Destroy( vout_thread_t *p_vout )
  *****************************************************************************/
 static int vout_Manage( vout_thread_t *p_vout )
 {    
-    if( p_vout->i_changes & VOUT_SIZE_CHANGE ) 
-    {
-        QTScaleMatrix( p_vout );
-        SetDSequenceMatrix( p_vout->p_sys->i_seq, 
-                            p_vout->p_sys->p_matrix );
-        p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
-    }
-
     if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
     {
         if( CoToggleFullscreen( p_vout ) )  
@@ -335,6 +326,15 @@ static int vout_Manage( vout_thread_t *p_vout )
         p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
     }
 
+    if( p_vout->i_changes & VOUT_SIZE_CHANGE ) 
+    {
+        QTScaleMatrix( p_vout );
+        SetDSequenceMatrix( p_vout->p_sys->i_seq, 
+                            p_vout->p_sys->p_matrix );
+        p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
+    }
+
     /* hide/show mouse cursor */
     if( p_vout->p_sys->b_mouse_moved ||
         p_vout->p_sys->i_time_mouse_last_moved )
index 43362ce974495b37cf4a9b86bbb4df17a698dc73..eeb67f302a7dff6190f3ebddfb199dfda8378cfb 100644 (file)
@@ -2,7 +2,7 @@
  * vout_qdview.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_qdview.m,v 1.2 2002/05/15 21:14:18 massiot Exp $
+ * $Id: vout_qdview.m,v 1.3 2002/05/18 18:48:24 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -50,6 +50,7 @@
     [[NSColor blackColor] set];
     NSRectFill(rect);
     [super drawRect: rect];
+    [o_wrapper voutDidResize: p_vout ];
 }
 
 @end
index a1d2a15a599fec5d9e5aa5ae0d8a9ff8d8b29a43..9c89b8f3876e3211a44f256f077ebe836638b841 100644 (file)
@@ -2,7 +2,7 @@
  * vout_vlc_wrapper.h: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_vlc_wrapper.h,v 1.3 2002/05/12 20:56:34 massiot Exp $
+ * $Id: vout_vlc_wrapper.h,v 1.4 2002/05/18 18:48:24 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -37,6 +37,7 @@
 
 - (void)mouseEvent:(unsigned int)ui_status forVout:(void *)_p_vout;
 - (BOOL)keyDown:(NSEvent *)o_event forVout:(void *)_p_vout;
+- (void)voutDidResize:(void *)_p_vout;
 
 @end
 
index f29ea4b42c1bd743b8a73df280a35464b90b8267..71cc93fd5347d6e11605a6e858dd1552e507a083 100644 (file)
@@ -2,7 +2,7 @@
  * vout_vlc_wrapper.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_vlc_wrapper.m,v 1.1 2002/05/12 20:56:34 massiot Exp $
+ * $Id: vout_vlc_wrapper.m,v 1.2 2002/05/18 18:48:24 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -128,6 +128,13 @@ static Vout_VLCWrapper *o_vout = nil;
     return( YES );
 }
 
+- (void)voutDidResize:(void *)_p_vout
+{
+    vout_thread_t * p_vout = (vout_thread_t *)_p_vout;
+
+    p_vout->i_changes |= VOUT_SIZE_CHANGE;
+}
+
 @end
 
 @implementation Vout_VLCWrapper (Internal)