callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gtk-3-22' into 'gtk-3-22'

Browse Source 
wayland: Fix setting geometry hints

See merge request GNOME/gtk!98
This commit is contained in:
Benjamin Otte
2018-04-09 20:17:00 +00:00
parent 22fd5b5766 8e74e515c7
commit d92df4ff2c
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3628,7 +3628,7 @@ gdk_wayland_window_set_geometry_hints (GdkWindow *window,
{ {
GdkWaylandDisplay *display_wayland; GdkWaylandDisplay *display_wayland;
GdkWindowImplWayland *impl; GdkWindowImplWayland *impl;
int width, height; int min_width = 0, min_height = 0, max_width = 0, max_height = 0;
if (GDK_WINDOW_DESTROYED (window) || if (GDK_WINDOW_DESTROYED (window) ||
!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window)) !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@ -3645,39 +3645,29 @@ gdk_wayland_window_set_geometry_hints (GdkWindow *window,
if (geom_mask & GDK_HINT_MIN_SIZE) if (geom_mask & GDK_HINT_MIN_SIZE)
{ {
width = MAX (0, geometry->min_width - (impl->margin_left + impl->margin_right)); min_width = MAX (0, geometry->min_width - (impl->margin_left + impl->margin_right));
height = MAX (0, geometry->min_height - (impl->margin_top + impl->margin_bottom)); min_height = MAX (0, geometry->min_height - (impl->margin_top + impl->margin_bottom));
}
else
{
width = 0;
height = 0;
} }
if (geom_mask & GDK_HINT_MAX_SIZE) if (geom_mask & GDK_HINT_MAX_SIZE)
{ {
width = MAX (0, geometry->max_width - (impl->margin_left + impl->margin_right)); max_width = MAX (0, geometry->max_width - (impl->margin_left + impl->margin_right));
height = MAX (0, geometry->max_height - (impl->margin_top + impl->margin_bottom)); max_height = MAX (0, geometry->max_height - (impl->margin_top + impl->margin_bottom));
}
else
{
width = 0;
height = 0;
} }
switch (display_wayland->shell_variant) switch (display_wayland->shell_variant)
{ {
case GDK_WAYLAND_SHELL_VARIANT_XDG_SHELL: case GDK_WAYLAND_SHELL_VARIANT_XDG_SHELL:
xdg_toplevel_set_min_size (impl->display_server.xdg_toplevel, xdg_toplevel_set_min_size (impl->display_server.xdg_toplevel,
width, height); min_width, min_height);
xdg_toplevel_set_max_size (impl->display_server.xdg_toplevel, xdg_toplevel_set_max_size (impl->display_server.xdg_toplevel,
width, height); max_width, max_height);
break; break;
case GDK_WAYLAND_SHELL_VARIANT_ZXDG_SHELL_V6: case GDK_WAYLAND_SHELL_VARIANT_ZXDG_SHELL_V6:
zxdg_toplevel_v6_set_min_size (impl->display_server.zxdg_toplevel_v6, zxdg_toplevel_v6_set_min_size (impl->display_server.zxdg_toplevel_v6,
width, height); min_width, min_height);
zxdg_toplevel_v6_set_max_size (impl->display_server.zxdg_toplevel_v6, zxdg_toplevel_v6_set_max_size (impl->display_server.zxdg_toplevel_v6,
width, height); max_width, max_height);
break; break;
} }
} }