mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-15 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wl_shell: map transient surfaces closer to parent

Browse source
This commit is contained in:
Tony Crisci 2017-10-09 18:36:11 -04:00
parent 22a16a59ca
commit d4c065e59b
3 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
rootston/wl_shell.c
View file

@ -73,6 +73,14 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
free(roots_surface);
}
static int shell_surface_compare_equals(const void *item, const void *cmp_to) {
const struct roots_view *view = item;
if (view->type == ROOTS_WL_SHELL_VIEW && view->wl_shell_surface == cmp_to) {
return 0;
}
return -1;
}
void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
struct roots_desktop *desktop =
wl_container_of(listener, desktop, wl_shell_surface);
@ -107,7 +115,20 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
struct roots_view *view = calloc(1, sizeof(struct roots_view));
view->type = ROOTS_WL_SHELL_VIEW;
view->x = view->y = 200;
if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TRANSIENT) {
// we need to map it relative to the parent
int i =
list_seq_find(desktop->views,
shell_surface_compare_equals, surface->parent);
if (i != -1) {
struct roots_view *parent = desktop->views->items[i];
view->x = parent->x + surface->transient_state->x;
view->y = parent->y + surface->transient_state->y;
}
} else {
view->x = view->y = 200;
}
view->wl_shell_surface = surface;
view->roots_wl_shell_surface = roots_surface;
view->wlr_surface = surface->surface;