diff options
author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-05-14 00:28:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-14 00:28:21 -0400 |
commit | 34b864fb1752fde2528db6aa86d53c23412a8f43 (patch) | |
tree | b387f1e1eb8f8fc16faeb4bf24a0ab6e8ba5787c /sway/tree/container.c | |
parent | 6ff7c5273659061ec4ff2f6c79c69af2d4d165a5 (diff) | |
parent | 270c1ee7e507f1d2960920a7f4f0cc70f4e13d26 (diff) |
Merge branch 'master' into fix-1975
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index fc35a81c..9f7294db 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -7,6 +7,8 @@ #include <wayland-server.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_wl_shell.h> +#include <wlr/types/wlr_xdg_shell_v6.h> +#include <wlr/types/wlr_xdg_shell.h> #include "cairo.h" #include "pango.h" #include "sway/config.h" @@ -459,6 +461,16 @@ struct sway_container *container_at(struct sway_container *parent, sview->wlr_xdg_surface_v6, view_sx, view_sy, &_sx, &_sy); break; + case SWAY_VIEW_XDG_SHELL: + // the top left corner of the sway container is the + // coordinate of the top left corner of the window geometry + view_sx += sview->wlr_xdg_surface->geometry.x; + view_sy += sview->wlr_xdg_surface->geometry.y; + + _surface = wlr_xdg_surface_surface_at( + sview->wlr_xdg_surface, + view_sx, view_sy, &_sx, &_sy); + break; } if (_surface) { *sx = _sx; |