diff options
author | Руслан Ижбулатов <lrn1986@gmail.com> | 2020-04-26 19:11:45 +0000 |
---|---|---|
committer | Руслан Ижбулатов <lrn1986@gmail.com> | 2020-04-26 19:11:45 +0000 |
commit | 83ebdbdbf4c0f68513967bb7f65a08cb6a9c7bd2 (patch) | |
tree | 410fef9355b23169f1ea15a2f40a9876eb552e0f | |
parent | 35b96770060ad98913788e988edb15c226b9d183 (diff) | |
download | gtk+-83ebdbdbf4c0f68513967bb7f65a08cb6a9c7bd2.tar.gz |
Revert "GDK W32: Use SWP_NOOWNERZORDER everywhere it can be applied"
This reverts commit fc2008f24073348f97751e2031761b6f388edabe.
Turns out, we *don't* have code to maintain Z-order. Restacking
code is not doint that, it just enforces a few weird Z-order-related
behaviours.
-rw-r--r-- | gdk/win32/gdkevents-win32.c | 6 | ||||
-rw-r--r-- | gdk/win32/gdkwindow-win32.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 7aef277c27..a695f5b0f7 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -1930,7 +1930,7 @@ ensure_stacking_on_unminimize (MSG *msg) g_print (" restacking %p above %p", msg->hwnd, lowest_transient)); SetWindowPos (msg->hwnd, lowest_transient, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); } } @@ -2011,7 +2011,7 @@ ensure_stacking_on_activate_app (MSG *msg, impl->transient_owner != NULL) { SetWindowPos (msg->hwnd, HWND_TOP, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); return; } @@ -2053,7 +2053,7 @@ ensure_stacking_on_activate_app (MSG *msg, g_print (" restacking %p above %p", msg->hwnd, rover)); SetWindowPos (msg->hwnd, rover, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); break; } } diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index cf416d8e2a..f355cea409 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -1474,7 +1474,7 @@ show_window_internal (GdkWindow *window, API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), (window->state & GDK_WINDOW_STATE_ABOVE)?HWND_TOPMOST:HWND_NOTOPMOST, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOOWNERZORDER)); + SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE)); } } @@ -1834,7 +1834,7 @@ gdk_win32_window_raise (GdkWindow *window) else API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), HWND_TOP, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER)); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE)); } } @@ -1851,7 +1851,7 @@ gdk_win32_window_lower (GdkWindow *window) API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), HWND_BOTTOM, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER)); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE)); } } @@ -2910,7 +2910,7 @@ _gdk_win32_window_update_style_bits (GdkWindow *window) rect.right += after.right - before.right; rect.bottom += after.bottom - before.bottom; - flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOOWNERZORDER; + flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOREPOSITION; if (will_be_topmost && !was_topmost) { @@ -5372,7 +5372,7 @@ gdk_win32_window_fullscreen (GdkWindow *window) y - workaround_padding, width + (workaround_padding * 2), height + (workaround_padding * 2), - SWP_NOCOPYBITS | SWP_SHOWWINDOW | SWP_NOOWNERZORDER)); + SWP_NOCOPYBITS | SWP_SHOWWINDOW)); } } @@ -5395,7 +5395,7 @@ gdk_win32_window_unfullscreen (GdkWindow *window) API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), HWND_NOTOPMOST, fi->r.left, fi->r.top, fi->r.right - fi->r.left, fi->r.bottom - fi->r.top, - SWP_NOCOPYBITS | SWP_SHOWWINDOW | SWP_NOOWNERZORDER)); + SWP_NOCOPYBITS | SWP_SHOWWINDOW)); g_object_set_data (G_OBJECT (window), "fullscreen-info", NULL); g_free (fi); @@ -5421,7 +5421,7 @@ gdk_win32_window_set_keep_above (GdkWindow *window, API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), setting ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOOWNERZORDER)); + SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE)); } gdk_synthesize_window_state (window, @@ -5447,7 +5447,7 @@ gdk_win32_window_set_keep_below (GdkWindow *window, API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), setting ? HWND_BOTTOM : HWND_NOTOPMOST, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOOWNERZORDER)); + SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE)); } gdk_synthesize_window_state (window, |