diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2021-11-05 19:38:21 +0200 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-11-09 12:08:29 +0000 |
| commit | e4f4aef1a5b1feb95c40b3c453f448c5bcf9c054 (patch) | |
| tree | 0cf75c6c5713758296b997576f1d78598055ced5 /src | |
| parent | 52df92d73985dba862a157c5ca3003cbe465e295 (diff) | |
layout: Fix-up the positions when placing the pop-up/dialog
Turns out we weren't accounting for the initial position (of the output)
as to derive the correct positioning of thew view/surface. This uses the
output x and y value and together with the values supplied by the user
to result in correct placement.
Bug-AGL: SPEC-4127
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I38f0bb9051d4650283cfa483936b121a6d136ca6
Diffstat (limited to 'src')
| -rw-r--r-- | src/layout.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/layout.c b/src/layout.c index 4ffcb16..ff1713b 100644 --- a/src/layout.c +++ b/src/layout.c @@ -555,6 +555,15 @@ ivi_layout_split_committed(struct ivi_surface *surface) app_id, ivi_layout_get_surface_role_name(surface), output->name); } +static void +ivi_compute_popup_position(const struct weston_output *output, struct weston_view *view, + int initial_x, int initial_y, int *new_x, int *new_y) +{ + *new_x = output->x + initial_x; + *new_y = output->y + initial_y; +} + + void ivi_layout_popup_committed(struct ivi_surface *surface) { @@ -566,6 +575,8 @@ ivi_layout_popup_committed(struct ivi_surface *surface) weston_desktop_surface_get_surface(dsurface); const char *app_id = weston_desktop_surface_get_app_id(dsurface); + int new_x, new_y; + struct ivi_output *output = surface->popup.output; struct weston_output *woutput = output->output; @@ -582,7 +593,10 @@ ivi_layout_popup_committed(struct ivi_surface *surface) assert(surface->role == IVI_SURFACE_ROLE_POPUP); weston_view_set_output(view, woutput); - weston_view_set_position(view, surface->popup.x, surface->popup.y); + + ivi_compute_popup_position(woutput, view, + surface->popup.x, surface->popup.y, &new_x, &new_y); + weston_view_set_position(view, new_x, new_y); /* only clip the pop-up dialog window if we have a valid * width and height being passed on. Users might not want to have one |