diff options
| author |  emersion <contact@emersion.fr> | 2018-04-04 15:53:46 -0400 |
|---|---|---|
| committer |  Drew DeVault <sir@cmpwn.com> | 2018-04-04 22:03:14 -0400 |
| commit | 8eff00f72395add1881aa677e3c718c0554cb096 (patch) | |
| tree | 803dc03246326c754732f3b8f635d8a67a2a3441 /sway/tree | |
| parent | Remove unused sway_view.unmanaged_link (diff) | |
| download | sway-8eff00f72395add1881aa677e3c718c0554cb096.tar.gz sway-8eff00f72395add1881aa677e3c718c0554cb096.tar.zst sway-8eff00f72395add1881aa677e3c718c0554cb096.zip | |
Remove unused SWAY_VIEW_TYPES
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/container.c | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 3be08645..1ea10759 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
| @@ -413,31 +413,28 @@ struct sway_container *container_at(struct sway_container *parent, | |||
| 413 | double view_sy = oy - swayc->y; | 413 | double view_sy = oy - swayc->y; |
| 414 | 414 | ||
| 415 | switch (sview->type) { | 415 | switch (sview->type) { |
| 416 | case SWAY_WL_SHELL_VIEW: | 416 | case SWAY_VIEW_XWAYLAND: |
| 417 | break; | 417 | case SWAY_VIEW_WL_SHELL: |
| 418 | case SWAY_XDG_SHELL_V6_VIEW: | 418 | break; |
| 419 | // the top left corner of the sway container is the | 419 | case SWAY_VIEW_XDG_SHELL_V6: |
| 420 | // coordinate of the top left corner of the window geometry | 420 | // the top left corner of the sway container is the |
| 421 | view_sx += sview->wlr_xdg_surface_v6->geometry.x; | 421 | // coordinate of the top left corner of the window geometry |
| 422 | view_sy += sview->wlr_xdg_surface_v6->geometry.y; | 422 | view_sx += sview->wlr_xdg_surface_v6->geometry.x; |
| 423 | 423 | view_sy += sview->wlr_xdg_surface_v6->geometry.y; | |
| 424 | // check for popups | 424 | |
| 425 | double popup_sx, popup_sy; | 425 | // check for popups |
| 426 | struct wlr_xdg_surface_v6 *popup = | 426 | double popup_sx, popup_sy; |
| 427 | wlr_xdg_surface_v6_popup_at(sview->wlr_xdg_surface_v6, | 427 | struct wlr_xdg_surface_v6 *popup = |
| 428 | view_sx, view_sy, &popup_sx, &popup_sy); | 428 | wlr_xdg_surface_v6_popup_at(sview->wlr_xdg_surface_v6, |
| 429 | 429 | view_sx, view_sy, &popup_sx, &popup_sy); | |
| 430 | if (popup) { | 430 | |
| 431 | *sx = view_sx - popup_sx; | 431 | if (popup) { |
| 432 | *sy = view_sy - popup_sy; | 432 | *sx = view_sx - popup_sx; |
| 433 | *surface = popup->surface; | 433 | *sy = view_sy - popup_sy; |
| 434 | return swayc; | 434 | *surface = popup->surface; |
| 435 | } | 435 | return swayc; |
| 436 | break; | 436 | } |
| 437 | case SWAY_XWAYLAND_VIEW: | 437 | break; |
| 438 | break; | ||
| 439 | default: | ||
| 440 | break; | ||
| 441 | } | 438 | } |
| 442 | 439 | ||
| 443 | // check for subsurfaces | 440 | // check for subsurfaces |