configure.ac | 10 +++++-----
libweston-desktop/wl-shell.c | 4 ++--
libweston-desktop/xdg-shell-v5.c | 8 +++++---
libweston-desktop/xdg-shell-v6.c | 8 +++++---
4 files changed, 17 insertions(+), 13 deletions(-)
New commits:
commit a08dff5bce52804850595a5ff968336a60574f4f
Author: Bryce Harrington <br...@osg.samsung.com>
Date: Tue Sep 20 12:22:46 2016 -0700
configure.ac: bump to version 1.12.0 for the official release
diff --git a/configure.ac b/configure.ac
index bd59725..619d3f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
m4_define([weston_major_version], [1])
-m4_define([weston_minor_version], [11])
-m4_define([weston_micro_version], [94])
+m4_define([weston_minor_version], [12])
+m4_define([weston_micro_version], [0])
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
m4_define([libweston_major_version], [1])
-m4_define([libweston_minor_version], [11])
-m4_define([libweston_patch_version], [94])
+m4_define([libweston_minor_version], [12])
+m4_define([libweston_patch_version], [0])
AC_PREREQ([2.64])
AC_INIT([weston],
@@ -14,7 +14,7 @@ AC_INIT([weston],
[weston],
[http://wayland.freedesktop.org])
-WAYLAND_PREREQ_VERSION="1.11.91"
+WAYLAND_PREREQ_VERSION="1.12.0"
AC_SUBST([WESTON_VERSION_MAJOR], [weston_major_version])
AC_SUBST([WESTON_VERSION_MINOR], [weston_minor_version])
commit a56b053ee154fd8c5b6782fa120ddc045e4e0147
Author: Quentin Glidic <sardemff7+...@sardemff7.net>
Date: Tue Sep 13 10:05:58 2016 +0200
libweston-desktop: Fix configure event for already well-sized surfaces
Even if the surface size is already correct, we need to store the
configured size in case some other state change triggers a configure
event.
Signed-off-by: Quentin Glidic <sardemff7+...@sardemff7.net>
Reviewed-by: Arnaud Vrac <av...@freebox.fr>
diff --git a/libweston-desktop/wl-shell.c b/libweston-desktop/wl-shell.c
index 74ce473..ded69f7 100644
--- a/libweston-desktop/wl-shell.c
+++ b/libweston-desktop/wl-shell.c
@@ -67,8 +67,8 @@ weston_desktop_wl_shell_surface_set_size(struct
weston_desktop_surface *dsurface
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(surface->surface);
- if (wsurface->width == width && wsurface->height == height)
- return;
+ if ((wsurface->width == width && wsurface->height == height) ||
+ (width == 0 && height == 0))
wl_shell_surface_send_configure(surface->resource,
WL_SHELL_SURFACE_RESIZE_NONE,
diff --git a/libweston-desktop/xdg-shell-v5.c b/libweston-desktop/xdg-shell-v5.c
index 83e5d30..14216b0 100644
--- a/libweston-desktop/xdg-shell-v5.c
+++ b/libweston-desktop/xdg-shell-v5.c
@@ -192,11 +192,13 @@ weston_desktop_xdg_surface_set_size(struct
weston_desktop_surface *dsurface,
struct weston_desktop_xdg_surface *surface = user_data;
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(surface->surface);
- if (wsurface->width == width && wsurface->height == height)
- return;
-
surface->requested_size.width = width;
surface->requested_size.height = height;
+
+ if ((wsurface->width == width && wsurface->height == height) ||
+ (width == 0 && height == 0))
+ return;
+
weston_desktop_xdg_surface_schedule_configure(surface);
}
diff --git a/libweston-desktop/xdg-shell-v6.c b/libweston-desktop/xdg-shell-v6.c
index d4d0112..2afce81 100644
--- a/libweston-desktop/xdg-shell-v6.c
+++ b/libweston-desktop/xdg-shell-v6.c
@@ -607,11 +607,13 @@ weston_desktop_xdg_toplevel_set_size(struct
weston_desktop_surface *dsurface,
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(toplevel->base.desktop_surface);
- if (wsurface->width == width && wsurface->height == height)
- return;
-
toplevel->requested_size.width = width;
toplevel->requested_size.height = height;
+
+ if ((wsurface->width == width && wsurface->height == height) ||
+ (width == 0 && height == 0))
+ return;
+
weston_desktop_xdg_surface_schedule_configure(&toplevel->base);
}
