diff options
| author | Nicolas Braud-Santoni <nicolas@braud-santoni.eu> | 2018-05-05 20:42:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-05 20:42:17 +0200 |
| commit | 30c00b26966d8bdd491e808604b7da87ec89f679 (patch) | |
| tree | d508d2e5999e6f258b49e6698fcc874ba03ca8b6 /sway/desktop | |
| parent | cb2a3e90360ed852f3ee46dfef3d28e69f4c3346 (diff) | |
| parent | a8d1b05bac4cee56731d7e4aaafdcd0acd6bb787 (diff) | |
| download | sway-30c00b26966d8bdd491e808604b7da87ec89f679.tar.xz | |
Merge branch 'master' into spelling
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 3 | ||||
| -rw-r--r-- | sway/desktop/xwayland.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 5880e9a9..fcee8ce9 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -176,8 +176,7 @@ static void handle_commit(struct wl_listener *listener, void *data) { // TODO: Let floating views do whatever view_update_size(view, xdg_shell_v6_view->pending_width, xdg_shell_v6_view->pending_height); - container_update_title(view->swayc, - view->wlr_xdg_surface_v6->toplevel->title); + view_update_title(view, false); view_damage(view, false); } diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index a1e672ce..b4eda71f 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -223,7 +223,7 @@ static void handle_commit(struct wl_listener *listener, void *data) { view_update_size(view, xwayland_view->pending_width, xwayland_view->pending_height); view_damage(view, false); - container_update_title(view->swayc, view->wlr_xwayland_surface->title); + view_update_title(view, false); } static void handle_unmap(struct wl_listener *listener, void *data) { |