diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-27 15:22:00 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-27 15:22:00 -0400 |
| commit | c555a66ddafe3ea06f3abbf38194a8589733082d (patch) | |
| tree | 2298ce1eb691b3d9d5a8ae69cb77894333f943c1 /rootston/wl_shell.c | |
| parent | 325def38418f5caefd6dc23749dd2ca6bae0a36c (diff) | |
| parent | b97160238fa5b61fef81316102559c8c3e137cd2 (diff) | |
Merge branch 'master' into feature/xwm-rewrite
Diffstat (limited to 'rootston/wl_shell.c')
| -rw-r--r-- | rootston/wl_shell.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index 88397af8..e5366672 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -56,6 +56,7 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) { struct roots_wl_shell_surface *roots_surface = wl_container_of(listener, roots_surface, destroy); + view_teardown(roots_surface->view); wl_list_remove(&roots_surface->destroy.link); wl_list_remove(&roots_surface->request_move.link); wl_list_remove(&roots_surface->request_resize.link); @@ -111,7 +112,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { view->desktop = desktop; roots_surface->view = view; wlr_list_add(desktop->views, view); - view_initialize(view); + view_setup(view); if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TRANSIENT) { // we need to map it relative to the parent |