[PATCH weston] libweston-desktop/{wl_shell, xwayland}: Fix changing between toplevel states

[Quentin Glidic]

On 16/08/2016 11:47, Emmanuel Gil Peyrot wrote:
> On Tue, Aug 16, 2016 at 11:42:47AM +0200, Quentin Glidic wrote:
>> From: Quentin Glidic <sardemff7+git at sardemff7.net>
>
> Tested-by: Emmanuel Gil Peyrot <emmanuel.peyrot at collabora.com>

Thanks, pushed:
f6636a8..6384edf  master -> master

Cheers,


>>
>> Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
>> ---
>>  libweston-desktop/wl-shell.c | 4 +++-
>>  libweston-desktop/xwayland.c | 4 +++-
>>  2 files changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/libweston-desktop/wl-shell.c b/libweston-desktop/wl-shell.c
>> index 7c6a589..74ce473 100644
>> --- a/libweston-desktop/wl-shell.c
>> +++ b/libweston-desktop/wl-shell.c
>> @@ -151,8 +151,10 @@ weston_desktop_wl_shell_change_state(struct weston_desktop_wl_shell_surface *sur
>>
>>  	assert(state != NONE);
>>
>> -	if (to_add && surface->added)
>> +	if (to_add && surface->added) {
>> +		surface->state = state;
>>  		return;
>> +	}
>>
>>  	if (surface->state != state) {
>>  		if (surface->state == POPUP)
>> diff --git a/libweston-desktop/xwayland.c b/libweston-desktop/xwayland.c
>> index da04f7f..cb08323 100644
>> --- a/libweston-desktop/xwayland.c
>> +++ b/libweston-desktop/xwayland.c
>> @@ -75,8 +75,10 @@ weston_desktop_xwayland_surface_change_state(struct weston_desktop_xwayland_surf
>>
>>  	assert(state != NONE);
>>
>> -	if (to_add && surface->added)
>> +	if (to_add && surface->added) {
>> +		surface->state = state;
>>  		return;
>> +	}
>>
>>  	if (surface->state != state) {
>>  		if (surface->state == XWAYLAND) {
>> --
>> 2.9.2
>>
>> _______________________________________________
>> wayland-devel mailing list
>> wayland-devel at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/wayland-devel
>


-- 

Quentin “Sardem FF7” Glidic