Commit 26c7dfb7 authored by Alexandros Frantzis's avatar Alexandros Frantzis Committed by Alexandre Julliard

winewayland.drv: Rename wayland_surface_configure_is_compatible for consistency.

Rename the function wayland_surface_configure_is_compatible to wayland_surface_config_is_compatible to match the associated struct name.
parent dfcd2d8b
...@@ -319,14 +319,14 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, ...@@ -319,14 +319,14 @@ void wayland_surface_attach_shm(struct wayland_surface *surface,
} }
/********************************************************************** /**********************************************************************
* wayland_surface_configure_is_compatible * wayland_surface_config_is_compatible
* *
* Checks whether a wayland_surface_configure object is compatible with the * Checks whether a wayland_surface_config object is compatible with the
* the provided arguments. * the provided arguments.
*/ */
static BOOL wayland_surface_configure_is_compatible(struct wayland_surface_config *conf, static BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf,
int width, int height, int width, int height,
enum wayland_surface_config_state state) enum wayland_surface_config_state state)
{ {
static enum wayland_surface_config_state mask = static enum wayland_surface_config_state mask =
WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED; WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED;
...@@ -451,9 +451,9 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) ...@@ -451,9 +451,9 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface)
/* Acknowledge any compatible processed config. */ /* Acknowledge any compatible processed config. */
if (surface->processing.serial && surface->processing.processed && if (surface->processing.serial && surface->processing.processed &&
wayland_surface_configure_is_compatible(&surface->processing, wayland_surface_config_is_compatible(&surface->processing,
width, height, width, height,
window->state)) window->state))
{ {
surface->current = surface->processing; surface->current = surface->processing;
memset(&surface->processing, 0, sizeof(surface->processing)); memset(&surface->processing, 0, sizeof(surface->processing));
...@@ -463,18 +463,18 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) ...@@ -463,18 +463,18 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface)
* config, use that, in order to draw windows that don't go through the * config, use that, in order to draw windows that don't go through the
* message loop (e.g., some splash screens). */ * message loop (e.g., some splash screens). */
else if (!surface->current.serial && surface->requested.serial && else if (!surface->current.serial && surface->requested.serial &&
wayland_surface_configure_is_compatible(&surface->requested, wayland_surface_config_is_compatible(&surface->requested,
width, height, width, height,
window->state)) window->state))
{ {
surface->current = surface->requested; surface->current = surface->requested;
memset(&surface->requested, 0, sizeof(surface->requested)); memset(&surface->requested, 0, sizeof(surface->requested));
xdg_surface_ack_configure(surface->xdg_surface, surface->current.serial); xdg_surface_ack_configure(surface->xdg_surface, surface->current.serial);
} }
else if (!surface->current.serial || else if (!surface->current.serial ||
!wayland_surface_configure_is_compatible(&surface->current, !wayland_surface_config_is_compatible(&surface->current,
width, height, width, height,
window->state)) window->state))
{ {
return FALSE; return FALSE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment