diff options
| author | Christopher Michael <cp.michael@samsung.com> | 2019-05-30 11:13:12 -0400 |
|---|---|---|
| committer | Christopher Michael <cp.michael@samsung.com> | 2019-05-30 11:13:12 -0400 |
| commit | 4c12625cab6de5e9f1116e5ab3b84f58f7e206b7 (patch) | |
| tree | 27ece3f83a9157c81a7beed3733744f2c6c0c4cd | |
| parent | ed6f7b2903ce581165f75ab075344617e358b7f5 (diff) | |
| download | enlightenment-4c12625cab6de5e9f1116e5ab3b84f58f7e206b7.tar.gz | |
wl_desktop_shell: Fix compilation due to over-zealous copy/paste
| -rw-r--r-- | src/modules/wl_desktop_shell/xdg6.c | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/src/modules/wl_desktop_shell/xdg6.c b/src/modules/wl_desktop_shell/xdg6.c index cf7d7bdd21..9276791d30 100644 --- a/src/modules/wl_desktop_shell/xdg6.c +++ b/src/modules/wl_desktop_shell/xdg6.c @@ -677,14 +677,10 @@ _apply_positioner_x(int x, Positioner *p, Eina_Bool invert) switch (an) { - case XDG_POSITIONER_ANCHOR_LEFT: - case XDG_POSITIONER_ANCHOR_TOP_LEFT: - case XDG_POSITIONER_ANCHOR_BOTTOM_LEFT: + case ZXDG_POSITIONER_V6_ANCHOR_LEFT: x += p->anchor_rect.x; break; - case XDG_POSITIONER_ANCHOR_RIGHT: - case XDG_POSITIONER_ANCHOR_TOP_RIGHT: - case XDG_POSITIONER_ANCHOR_BOTTOM_RIGHT: + case ZXDG_POSITIONER_V6_ANCHOR_RIGHT: x += p->anchor_rect.x + p->anchor_rect.w; break; default: @@ -694,14 +690,10 @@ _apply_positioner_x(int x, Positioner *p, Eina_Bool invert) switch (grav) { - case XDG_POSITIONER_GRAVITY_LEFT: - case XDG_POSITIONER_GRAVITY_TOP_LEFT: - case XDG_POSITIONER_GRAVITY_BOTTOM_LEFT: + case ZXDG_POSITIONER_V6_GRAVITY_LEFT: x -= p->size.w; break; - case XDG_POSITIONER_GRAVITY_RIGHT: - case XDG_POSITIONER_GRAVITY_TOP_RIGHT: - case XDG_POSITIONER_GRAVITY_BOTTOM_RIGHT: + case ZXDG_POSITIONER_V6_GRAVITY_RIGHT: x = x; break; default: @@ -737,14 +729,10 @@ _apply_positioner_y(int y, Positioner *p, Eina_Bool invert) switch (an) { - case XDG_POSITIONER_ANCHOR_TOP: - case XDG_POSITIONER_ANCHOR_TOP_LEFT: - case XDG_POSITIONER_ANCHOR_TOP_RIGHT: + case ZXDG_POSITIONER_V6_ANCHOR_TOP: y += p->anchor_rect.y; break; - case XDG_POSITIONER_ANCHOR_BOTTOM: - case XDG_POSITIONER_ANCHOR_BOTTOM_LEFT: - case XDG_POSITIONER_ANCHOR_BOTTOM_RIGHT: + case ZXDG_POSITIONER_V6_ANCHOR_BOTTOM: y += p->anchor_rect.y + p->anchor_rect.h; break; default: @@ -754,14 +742,10 @@ _apply_positioner_y(int y, Positioner *p, Eina_Bool invert) switch (grav) { - case XDG_POSITIONER_GRAVITY_TOP: - case XDG_POSITIONER_GRAVITY_TOP_LEFT: - case XDG_POSITIONER_GRAVITY_TOP_RIGHT: + case ZXDG_POSITIONER_V6_GRAVITY_TOP: y -= p->size.h; break; - case XDG_POSITIONER_GRAVITY_BOTTOM: - case XDG_POSITIONER_GRAVITY_BOTTOM_LEFT: - case XDG_POSITIONER_GRAVITY_BOTTOM_RIGHT: + case ZXDG_POSITIONER_V6_GRAVITY_BOTTOM: y = y; break; default: |