Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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 ulion authored
Showing with 3 additions and 1 deletion.
  1. +3 −1 xbmc/windowing/osx/WinSystemOSX.mm
4 xbmc/windowing/osx/WinSystemOSX.mm
View
@@ -710,6 +710,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
static NSView* last_view = NULL;
static NSSize last_view_size;
static NSPoint last_view_origin;
+ static NSInteger last_window_level = NSNormalWindowLevel;
bool was_fullscreen = m_bFullScreen;
static int lastDisplayNr = res.iScreen;
NSOpenGLContext* cur_context;
@@ -779,6 +780,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
last_view_origin = [last_view frame].origin;
last_window_screen = [[last_view window] screen];
last_window_origin = [[last_view window] frame].origin;
+ last_window_level = [[last_view window] level];
if (CSettings::Get().GetBool("videoscreen.fakefullscreen"))
{
@@ -891,7 +893,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
if (CSettings::Get().GetBool("videoscreen.fakefullscreen"))
{
// restore the windowed window level
- [[last_view window] setLevel:NSNormalWindowLevel];
+ [[last_view window] setLevel:last_window_level];
// Get rid of the new window we created.
if (windowedFullScreenwindow != NULL)
Please sign in to comment.
Something went wrong with that request. Please try again.