Move unsetting of view->surface into view_unmap

This commit is contained in:
Ryan Dwyer 2018-06-27 17:54:57 +10:00
parent 8773ed3970
commit e6829c5991
4 changed files with 1 additions and 4 deletions

View file

@ -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) {

View file

@ -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) {

View file

@ -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);

View file

@ -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) {