mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

layer-shell: fix type of margins

Browse source 
These currently use uint32_t while they are an int32_t in the protocol.
This commit is contained in:
Isaac Freund 2021-12-15 16:30:32 +01:00 • committed by Kirill Primak
parent 7360810f2e
commit 92d137c78a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wlr/types/wlr_layer_shell_v1.h
View file

@ -58,7 +58,7 @@ struct wlr_layer_surface_v1_state {
uint32_t anchor; uint32_t anchor;
int32_t exclusive_zone; int32_t exclusive_zone;
struct { struct {
uint32_t top, right, bottom, left; int32_t top, right, bottom, left;
} margin; } margin;
enum zwlr_layer_surface_v1_keyboard_interactivity keyboard_interactive; enum zwlr_layer_surface_v1_keyboard_interactivity keyboard_interactive;
uint32_t desired_width, desired_height; uint32_t desired_width, desired_height;

8
types/wlr_layer_shell_v1.c
View file

@ -168,10 +168,10 @@ static void layer_surface_handle_set_margin(
return; return;
} }
if (surface->current.margin.top == (uint32_t) top if (surface->current.margin.top == top
&& surface->current.margin.right == (uint32_t) right && surface->current.margin.right == right
&& surface->current.margin.bottom == (uint32_t) bottom && surface->current.margin.bottom == bottom
&& surface->current.margin.left == (uint32_t) left) { && surface->current.margin.left == left) {
surface->pending.committed &= ~WLR_LAYER_SURFACE_V1_STATE_MARGIN; surface->pending.committed &= ~WLR_LAYER_SURFACE_V1_STATE_MARGIN;
} else { } else {
surface->pending.committed |= WLR_LAYER_SURFACE_V1_STATE_MARGIN; surface->pending.committed |= WLR_LAYER_SURFACE_V1_STATE_MARGIN;