mirror of
https://github.com/glfw/glfw.git
synced 2025-10-05 06:06:36 +00:00
Merge 8f80ec6dda
into 0f488ac286
This commit is contained in:
commit
cc3125eddc
@ -128,6 +128,7 @@ information on what to include when reporting a bug.
|
||||
- [Cocoa] Bugfix: Disabled use of deprecated `CGDisplayModeCopyPixelEncoding`
|
||||
function on macOS 10.12+
|
||||
- [Cocoa] Bugfix: Running in AppSandbox would emit warnings (#816,#882)
|
||||
- [Cocoa] Bugfix: Command-tabbing issues with fullscreen windows (#848)
|
||||
- [EGL] Added support for `EGL_KHR_get_all_proc_addresses` (#871)
|
||||
|
||||
|
||||
|
@ -1248,7 +1248,25 @@ void _glfwPlatformMaximizeWindow(_GLFWwindow* window)
|
||||
|
||||
void _glfwPlatformShowWindow(_GLFWwindow* window)
|
||||
{
|
||||
if (window->monitor)
|
||||
{
|
||||
[window->ns.object makeKeyAndOrderFront:nil];
|
||||
|
||||
NSApplicationPresentationOptions options =
|
||||
NSApplicationPresentationHideDock +
|
||||
NSApplicationPresentationHideMenuBar +
|
||||
NSApplicationPresentationDisableProcessSwitching +
|
||||
NSApplicationPresentationDisableHideApplication;
|
||||
[NSApp setPresentationOptions:options];
|
||||
}
|
||||
else
|
||||
{
|
||||
[window->ns.object orderFront:nil];
|
||||
|
||||
NSApplicationPresentationOptions options =
|
||||
NSApplicationPresentationDefault;
|
||||
[NSApp setPresentationOptions:options];
|
||||
}
|
||||
}
|
||||
|
||||
void _glfwPlatformHideWindow(_GLFWwindow* window)
|
||||
@ -1265,6 +1283,22 @@ void _glfwPlatformFocusWindow(_GLFWwindow* window)
|
||||
[NSApp activateIgnoringOtherApps:YES];
|
||||
|
||||
[window->ns.object makeKeyAndOrderFront:nil];
|
||||
|
||||
if (window->monitor)
|
||||
{
|
||||
NSApplicationPresentationOptions options =
|
||||
NSApplicationPresentationHideDock +
|
||||
NSApplicationPresentationHideMenuBar +
|
||||
NSApplicationPresentationDisableProcessSwitching +
|
||||
NSApplicationPresentationDisableHideApplication;
|
||||
[NSApp setPresentationOptions:options];
|
||||
}
|
||||
else
|
||||
{
|
||||
NSApplicationPresentationOptions options =
|
||||
NSApplicationPresentationDefault;
|
||||
[NSApp setPresentationOptions:options];
|
||||
}
|
||||
}
|
||||
|
||||
void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
|
||||
@ -1362,6 +1396,22 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
|
||||
|
||||
[window->ns.object setHasShadow:YES];
|
||||
}
|
||||
|
||||
if (window->monitor)
|
||||
{
|
||||
NSApplicationPresentationOptions options =
|
||||
NSApplicationPresentationHideDock +
|
||||
NSApplicationPresentationHideMenuBar +
|
||||
NSApplicationPresentationDisableProcessSwitching +
|
||||
NSApplicationPresentationDisableHideApplication;
|
||||
[NSApp setPresentationOptions:options];
|
||||
}
|
||||
else
|
||||
{
|
||||
NSApplicationPresentationOptions options =
|
||||
NSApplicationPresentationDefault;
|
||||
[NSApp setPresentationOptions:options];
|
||||
}
|
||||
}
|
||||
|
||||
int _glfwPlatformWindowFocused(_GLFWwindow* window)
|
||||
|
Loading…
Reference in New Issue
Block a user