[vlc-commits] macosx: implemented float-on-top

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Aug  8 23:35:39 2011 +0200| [cc73090229f22513c5501d01de6445c5c95e66e3] | committer: Felix Paul Kühne

macosx: implemented float-on-top

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cc73090229f22513c5501d01de6445c5c95e66e3
---

 modules/gui/macosx/MainWindow.m |    3 +--
 modules/video_output/macosx.m   |   10 +++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 514f491..9591170 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -557,8 +557,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (IBAction)fullscreen:(id)sender
 {
-//?!    [[VLCCoreInteraction sharedInstance] toggleFullscreen];
-    [self enterFullscreen];
+    [[VLCCoreInteraction sharedInstance] toggleFullscreen];
 }
 
 - (IBAction)dropzoneButtonAction:(id)sender
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 4034858..dcbfe3b 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -288,11 +288,19 @@ static int Control (vout_display_t *vd, int query, va_list ap)
     switch (query)
     {
         case VOUT_DISPLAY_CHANGE_FULLSCREEN:
-        case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
         {
             /* todo */
             return VLC_EGENERIC;
         }
+        case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
+        {
+            unsigned state = va_arg (ap, unsigned);
+            if( (state & VOUT_WINDOW_STATE_ABOVE) != 0)
+                [[sys->glView window] setLevel: NSStatusWindowLevel];
+            else
+                [[sys->glView window] setLevel: NSNormalWindowLevel];
+            return VLC_SUCCESS;
+        }
         case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
         case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
         case VOUT_DISPLAY_CHANGE_ZOOM: