AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: Treat being tiled as maximized when saving size

Browse Source 
We should never save a size when we're tiled, just as we shouldn't when
we're maximized. This fixes returning to the correct floating size after
having been tiled or maximized.
This commit is contained in:
Jonas Ådahl 2020-04-02 17:51:57 +02:00
parent 04b7853a38
commit 50aa947e51
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/wayland/gdkwindow-wayland.c
View File

@ -315,7 +315,9 @@ _gdk_wayland_window_save_size (GdkWindow *window)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
if (window->state & (GDK_WINDOW_STATE_FULLSCREEN | GDK_WINDOW_STATE_MAXIMIZED))
if (window->state & (GDK_WINDOW_STATE_FULLSCREEN |
GDK_WINDOW_STATE_MAXIMIZED |
GDK_WINDOW_STATE_TILED))
return;
impl->saved_width = window->width - impl->margin_left - impl->margin_right;
@ -327,7 +329,9 @@ _gdk_wayland_window_clear_saved_size (GdkWindow *window)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
if (window->state & (GDK_WINDOW_STATE_FULLSCREEN | GDK_WINDOW_STATE_MAXIMIZED))
if (window->state & (GDK_WINDOW_STATE_FULLSCREEN |
GDK_WINDOW_STATE_MAXIMIZED |
GDK_WINDOW_STATE_TILED))
return;
impl->saved_width = -1;
@ -3348,7 +3352,9 @@ gdk_window_wayland_move_resize (GdkWindow *window,
}
}
if (window->state & (GDK_WINDOW_STATE_FULLSCREEN | GDK_WINDOW_STATE_MAXIMIZED))
if (window->state & (GDK_WINDOW_STATE_FULLSCREEN |
GDK_WINDOW_STATE_MAXIMIZED |
GDK_WINDOW_STATE_TILED))
{
impl->saved_width = width;
impl->saved_height = height;