hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xdg-shell: fix geometry types

This commit is contained in:
Kirill Primak 2022-11-04 21:53:39 +03:00 committed by Simon Ser
parent 92e3c5b798
commit 1243a855d4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/wlr/types/wlr_xdg_shell.h
View File

@ -135,9 +135,9 @@ enum wlr_xdg_surface_role {
struct wlr_xdg_toplevel_state { struct wlr_xdg_toplevel_state {
bool maximized, fullscreen, resizing, activated; bool maximized, fullscreen, resizing, activated;
uint32_t tiled; // enum wlr_edges uint32_t tiled; // enum wlr_edges
uint32_t width, height; int32_t width, height;
uint32_t max_width, max_height; int32_t max_width, max_height;
uint32_t min_width, min_height; int32_t min_width, min_height;
}; };
enum wlr_xdg_toplevel_wm_capabilities { enum wlr_xdg_toplevel_wm_capabilities {
@ -156,9 +156,9 @@ struct wlr_xdg_toplevel_configure {
uint32_t fields; // enum wlr_xdg_toplevel_configure_field uint32_t fields; // enum wlr_xdg_toplevel_configure_field
bool maximized, fullscreen, resizing, activated; bool maximized, fullscreen, resizing, activated;
uint32_t tiled; // enum wlr_edges uint32_t tiled; // enum wlr_edges
uint32_t width, height; int32_t width, height;
struct { struct {
uint32_t width, height; int32_t width, height;
} bounds; } bounds;
uint32_t wm_capabilities; // enum wlr_xdg_toplevel_wm_capabilities uint32_t wm_capabilities; // enum wlr_xdg_toplevel_wm_capabilities
}; };
@ -307,7 +307,7 @@ struct wlr_xdg_toplevel_show_window_menu_event {
struct wlr_xdg_toplevel *toplevel; struct wlr_xdg_toplevel *toplevel;
struct wlr_seat_client *seat; struct wlr_seat_client *seat;
uint32_t serial; uint32_t serial;
uint32_t x, y; int32_t x, y;
}; };
/** /**
@ -358,7 +358,7 @@ void wlr_xdg_surface_ping(struct wlr_xdg_surface *surface);
* configure serial. * configure serial.
*/ */
uint32_t wlr_xdg_toplevel_set_size(struct wlr_xdg_toplevel *toplevel, uint32_t wlr_xdg_toplevel_set_size(struct wlr_xdg_toplevel *toplevel,
uint32_t width, uint32_t height); int32_t width, int32_t height);
/** /**
* Request that this toplevel show itself in an activated or deactivated * Request that this toplevel show itself in an activated or deactivated

6
types/xdg_shell/wlr_xdg_toplevel.c
View File

@ -101,8 +101,8 @@ struct wlr_xdg_toplevel_configure *send_xdg_toplevel_configure(
} }
assert(nstates <= sizeof(states) / sizeof(states[0])); assert(nstates <= sizeof(states) / sizeof(states[0]));
uint32_t width = configure->width; int32_t width = configure->width;
uint32_t height = configure->height; int32_t height = configure->height;
struct wl_array wl_states = { struct wl_array wl_states = {
.size = nstates * sizeof(states[0]), .size = nstates * sizeof(states[0]),
.data = states, .data = states,
@ -532,7 +532,7 @@ void wlr_xdg_toplevel_send_close(struct wlr_xdg_toplevel *toplevel) {
} }
uint32_t wlr_xdg_toplevel_set_size(struct wlr_xdg_toplevel *toplevel, uint32_t wlr_xdg_toplevel_set_size(struct wlr_xdg_toplevel *toplevel,
uint32_t width, uint32_t height) { int32_t width, int32_t height) {
toplevel->scheduled.width = width; toplevel->scheduled.width = width;
toplevel->scheduled.height = height; toplevel->scheduled.height = height;
return wlr_xdg_surface_schedule_configure(toplevel->base); return wlr_xdg_surface_schedule_configure(toplevel->base);