parent
a2bd890709
commit
ccfe682de2
|
@ -50237,6 +50237,10 @@ void _glfwInputWindowFocus(_GLFWwindow* window, GLFWbool focused)
|
||||||
if (window->callbacks.focus)
|
if (window->callbacks.focus)
|
||||||
window->callbacks.focus((GLFWwindow*) window, focused);
|
window->callbacks.focus((GLFWwindow*) window, focused);
|
||||||
|
|
||||||
|
// zak: disable top-most if we lose focus
|
||||||
|
if (window->monitor)
|
||||||
|
_glfwPlatformSetWindowFloating(window, focused);
|
||||||
|
|
||||||
if (!focused)
|
if (!focused)
|
||||||
{
|
{
|
||||||
int key, button;
|
int key, button;
|
||||||
|
@ -392672,9 +392676,11 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
|
||||||
if( flag("--fullscreen") ) scale = 100;
|
if( flag("--fullscreen") ) scale = 100;
|
||||||
scale = (scale < 1 ? scale * 100 : scale);
|
scale = (scale < 1 ? scale * 100 : scale);
|
||||||
|
|
||||||
bool FLAGS_FULLSCREEN = scale > 100;
|
bool FLAGS_FULLSCREEN = scale > 101;
|
||||||
|
bool FLAGS_FULLSCREEN_BORDERLESS = scale == 101;
|
||||||
bool FLAGS_FULLSCREEN_DESKTOP = scale == 100;
|
bool FLAGS_FULLSCREEN_DESKTOP = scale == 100;
|
||||||
bool FLAGS_WINDOWED = scale < 100;
|
bool FLAGS_WINDOWED = scale < 100 || FLAGS_FULLSCREEN_BORDERLESS;
|
||||||
|
flags |= FLAGS_FULLSCREEN_BORDERLESS == 1 ? WINDOW_BORDERLESS : 0;
|
||||||
bool FLAGS_TRANSPARENT = flag("--transparent") || (flags & WINDOW_TRANSPARENT);
|
bool FLAGS_TRANSPARENT = flag("--transparent") || (flags & WINDOW_TRANSPARENT);
|
||||||
if( FLAGS_TRANSPARENT ) FLAGS_FULLSCREEN = 0, FLAGS_FULLSCREEN_DESKTOP = 0, FLAGS_WINDOWED = 1;
|
if( FLAGS_TRANSPARENT ) FLAGS_FULLSCREEN = 0, FLAGS_FULLSCREEN_DESKTOP = 0, FLAGS_WINDOWED = 1;
|
||||||
scale = (scale > 100 ? 100 : scale) / 100.f;
|
scale = (scale > 100 ? 100 : scale) / 100.f;
|
||||||
|
|
|
@ -17193,6 +17193,10 @@ void _glfwInputWindowFocus(_GLFWwindow* window, GLFWbool focused)
|
||||||
if (window->callbacks.focus)
|
if (window->callbacks.focus)
|
||||||
window->callbacks.focus((GLFWwindow*) window, focused);
|
window->callbacks.focus((GLFWwindow*) window, focused);
|
||||||
|
|
||||||
|
// zak: disable top-most if we lose focus
|
||||||
|
if (window->monitor)
|
||||||
|
_glfwPlatformSetWindowFloating(window, focused);
|
||||||
|
|
||||||
if (!focused)
|
if (!focused)
|
||||||
{
|
{
|
||||||
int key, button;
|
int key, button;
|
||||||
|
|
|
@ -286,9 +286,11 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
|
||||||
if( flag("--fullscreen") ) scale = 100;
|
if( flag("--fullscreen") ) scale = 100;
|
||||||
scale = (scale < 1 ? scale * 100 : scale);
|
scale = (scale < 1 ? scale * 100 : scale);
|
||||||
|
|
||||||
bool FLAGS_FULLSCREEN = scale > 100;
|
bool FLAGS_FULLSCREEN = scale > 101;
|
||||||
|
bool FLAGS_FULLSCREEN_BORDERLESS = scale == 101;
|
||||||
bool FLAGS_FULLSCREEN_DESKTOP = scale == 100;
|
bool FLAGS_FULLSCREEN_DESKTOP = scale == 100;
|
||||||
bool FLAGS_WINDOWED = scale < 100;
|
bool FLAGS_WINDOWED = scale < 100 || FLAGS_FULLSCREEN_BORDERLESS;
|
||||||
|
flags |= FLAGS_FULLSCREEN_BORDERLESS == 1 ? WINDOW_BORDERLESS : 0;
|
||||||
bool FLAGS_TRANSPARENT = flag("--transparent") || (flags & WINDOW_TRANSPARENT);
|
bool FLAGS_TRANSPARENT = flag("--transparent") || (flags & WINDOW_TRANSPARENT);
|
||||||
if( FLAGS_TRANSPARENT ) FLAGS_FULLSCREEN = 0, FLAGS_FULLSCREEN_DESKTOP = 0, FLAGS_WINDOWED = 1;
|
if( FLAGS_TRANSPARENT ) FLAGS_FULLSCREEN = 0, FLAGS_FULLSCREEN_DESKTOP = 0, FLAGS_WINDOWED = 1;
|
||||||
scale = (scale > 100 ? 100 : scale) / 100.f;
|
scale = (scale > 100 ? 100 : scale) / 100.f;
|
||||||
|
|
|
@ -31228,6 +31228,10 @@ void _glfwInputWindowFocus(_GLFWwindow* window, GLFWbool focused)
|
||||||
if (window->callbacks.focus)
|
if (window->callbacks.focus)
|
||||||
window->callbacks.focus((GLFWwindow*) window, focused);
|
window->callbacks.focus((GLFWwindow*) window, focused);
|
||||||
|
|
||||||
|
// zak: disable top-most if we lose focus
|
||||||
|
if (window->monitor)
|
||||||
|
_glfwPlatformSetWindowFloating(window, focused);
|
||||||
|
|
||||||
if (!focused)
|
if (!focused)
|
||||||
{
|
{
|
||||||
int key, button;
|
int key, button;
|
||||||
|
|
Loading…
Reference in New Issue