ceos/cagebreak
1
0
Fork 0
mirror of https://cagebreak.project-repo.co/cagebreak.git synced 2026-08-09 15:19:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development' of https://github.com/project-repo/cagebreak into development

Browse source
This commit is contained in:
Cagebreak Signing Key 7 2021-06-25 22:54:51 +02:00
commit da9800d2b0
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -53,7 +53,7 @@ if is_freebsd
)
endif
wlroots = dependency('wlroots', version: ['>=0.13.0', '< 0.14.0'])
wlroots = dependency('wlroots', version: ['>=0.14.0', '< 0.15.0'])
wayland_protos = dependency('wayland-protocols', version: '>=1.14')
wayland_server = dependency('wayland-server')
wayland_cursor = dependency('wayland-cursor')

10
message.c
View file

@ -108,11 +108,17 @@ message_set_output(struct cg_output *output, const char *string,
return;
}
message->message = create_message_texture(string, output);
if(!message->message) {
wlr_log(WLR_ERROR, "Could not create message texture");
free(box);
free(message);
return;
}
message->position = box;
wl_list_insert(&output->messages, &message->link);
int width, height;
wlr_texture_get_size(message->message, &width, &height);
int width = message->message->width;
int height = message->message->height;
message->position->width = width;
message->position->height = height;
switch(align) {

8
view.c
View file

@ -337,7 +337,13 @@ view_map(struct cg_view *view, struct wlr_surface *surface,
view->wlr_surface = surface;
struct wlr_subsurface *subsurface;
wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces, parent_link) {
wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces_above,
parent_link) {
subsurface_create(NULL, view, subsurface);
}
wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces_below,
parent_link) {
subsurface_create(NULL, view, subsurface);
}