diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-27 17:54:57 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-27 17:54:57 +1000 |
| commit | e6829c5991cac1bd164f800c14fccd522d702783 (patch) | |
| tree | 74f48c0c81cfa64bd480195bddc47ada10812cc4 | |
| parent | 8773ed39701748ba5500b4698d028795aa6e812e (diff) | |
| download | sway-e6829c5991cac1bd164f800c14fccd522d702783.tar.xz | |
Move unsetting of view->surface into view_unmap
| -rw-r--r-- | sway/desktop/xdg_shell.c | 1 | ||||
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 1 | ||||
| -rw-r--r-- | sway/desktop/xwayland.c | 2 | ||||
| -rw-r--r-- | sway/tree/view.c | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index b6fa9525..b076d772 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -201,7 +201,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) { wl_list_remove(&xdg_shell_view->commit.link); wl_list_remove(&xdg_shell_view->new_popup.link); - view->surface = NULL; } static void handle_map(struct wl_listener *listener, void *data) { diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 6042a806..7320e629 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -200,7 +200,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) { wl_list_remove(&xdg_shell_v6_view->commit.link); wl_list_remove(&xdg_shell_v6_view->new_popup.link); - view->surface = NULL; } static void handle_map(struct wl_listener *listener, void *data) { diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 1d5dab70..854da006 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -263,7 +263,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) { view_unmap(view); wl_list_remove(&xwayland_view->commit.link); - view->surface = NULL; } static void handle_map(struct wl_listener *listener, void *data) { @@ -301,7 +300,6 @@ static void handle_destroy(struct wl_listener *listener, void *data) { if (view->surface) { view_unmap(view); wl_list_remove(&xwayland_view->commit.link); - view->surface = NULL; } wl_list_remove(&xwayland_view->destroy.link); diff --git a/sway/tree/view.c b/sway/tree/view.c index 68d2a029..9f85bac0 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -555,6 +555,7 @@ void view_unmap(struct sway_view *view) { struct sway_container *parent = container_destroy(view->swayc); arrange_and_commit(parent); } + view->surface = NULL; } void view_update_position(struct sway_view *view, double lx, double ly) { |