Skip to content
This repository
Browse code

Merge pull request #2710 from ulion/master

[OSX] Fix always on top after restore from fullscreen. Fix #14312
  • Loading branch information...
commit dca4014f4afef9abe74247bd65246878fee02301 2 parents 06b2066 + ef82d9b
ulion authored May 09, 2013

Showing 1 changed file with 3 additions and 1 deletion. Show diff stats Hide diff stats

  1. 4  xbmc/windowing/osx/WinSystemOSX.mm
4  xbmc/windowing/osx/WinSystemOSX.mm
@@ -710,6 +710,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
710 710
   static NSView* last_view = NULL;
711 711
   static NSSize last_view_size;
712 712
   static NSPoint last_view_origin;
  713
+  static NSInteger last_window_level = NSNormalWindowLevel;
713 714
   bool was_fullscreen = m_bFullScreen;
714 715
   static int lastDisplayNr = res.iScreen;
715 716
   NSOpenGLContext* cur_context;
@@ -779,6 +780,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
779 780
     last_view_origin = [last_view frame].origin;
780 781
     last_window_screen = [[last_view window] screen];
781 782
     last_window_origin = [[last_view window] frame].origin;
  783
+    last_window_level = [[last_view window] level];
782 784
 
783 785
     if (CSettings::Get().GetBool("videoscreen.fakefullscreen"))
784 786
     {
@@ -891,7 +893,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
891 893
     if (CSettings::Get().GetBool("videoscreen.fakefullscreen"))
892 894
     {
893 895
       // restore the windowed window level
894  
-      [[last_view window] setLevel:NSNormalWindowLevel];
  896
+      [[last_view window] setLevel:last_window_level];
895 897
 
896 898
       // Get rid of the new window we created.
897 899
       if (windowedFullScreenwindow != NULL)

0 notes on commit dca4014

Please sign in to comment.
Something went wrong with that request. Please try again.