blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: blankie:dkondor-upstream-pr-2551
Branches Tags
blankie:dkondor-upstream-pr-2551
blankie:master
blankie:0.15.0
blankie:0.14.1
blankie:0.14.0
blankie:0.13.0
blankie:0.12.0
blankie:0.11.0
blankie:0.10.1
blankie:0.10.0
blankie:0.9.1
blankie:0.9.0
blankie:0.8.1
blankie:0.8.0
blankie:0.7.0
blankie:0.6.0
blankie:0.5.0
blankie:0.4.1
blankie:0.4
blankie:0.3
blankie:0.2
blankie:0.1
...
pull from: blankie:master
Branches Tags
blankie:dkondor-upstream-pr-2551
blankie:master
blankie:0.15.0
blankie:0.14.1
blankie:0.14.0
blankie:0.13.0
blankie:0.12.0
blankie:0.11.0
blankie:0.10.1
blankie:0.10.0
blankie:0.9.1
blankie:0.9.0
blankie:0.8.1
blankie:0.8.0
blankie:0.7.0
blankie:0.6.0
blankie:0.5.0
blankie:0.4.1
blankie:0.4
blankie:0.3
blankie:0.2
blankie:0.1

4 Commits
dkondor-up ... master

Author SHA1 Message Date
Simon Ser 93e050c602 Remove wlr_box.h redirection 
Compositors should've all been updated to use the new header by now.
 2021-12-17 15:38:03 +01:00
Simon Ser 562b24b9fc build: bump soversion 
According to [1] this should be done at each release with breaking ABI
changes.

[1]: https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Core-contributor-guide#releasing-a-new-version

Fixes: 7360810f2e ("build: bump to version 0.16.0")
 2021-12-17 12:53:18 +01:00
Isaac Freund 92d137c78a layer-shell: fix type of margins 
These currently use uint32_t while they are an int32_t in the protocol.
 2021-12-17 10:57:21 +00:00
Simon Ser 7360810f2e build: bump to version 0.16.0 2021-12-17 11:54:06 +01:00
4 changed files with 7 additions and 14 deletions
Show Stats Expand all files Collapse all files

7
include/wlr/types/wlr_box.h
View File

@ -1,7 +0,0 @@
#ifndef WLR_TYPES_WLR_BOX_H
#define WLR_TYPES_WLR_BOX_H
#warning "wlr_box has been moved to wlr/util/box.h"
#include <wlr/util/box.h>
#endif

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

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

4
meson.build
View File

@ -1,7 +1,7 @@
project(
'wlroots',
'c',
version: '0.15.0',
version: '0.16.0',
license: 'MIT',
meson_version: '>=0.58.1',
default_options: [
@ -15,7 +15,7 @@ project(
# necessary for bugfix releases. Increasing soversion is required because
# wlroots never guarantees ABI stability -- only API stability is guaranteed
# between minor releases.
soversion = 10
soversion = 11
little_endian = host_machine.endian() == 'little'
big_endian = host_machine.endian() == 'big'

8
types/wlr_layer_shell_v1.c
View File

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