diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2022-08-05 16:21:34 +0300 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2022-08-16 23:08:10 +0300 |
| commit | 0acbca5d1a9ca5aad361dfc2807f3822223c739d (patch) | |
| tree | bc8983ca84381a42a716021889adc01e0607853a /src/layout.c | |
| parent | 7b2e820991ba434e5a1ccb2b0d355756474d23df (diff) | |
agl-shell: Add split functionality into agl-shell protocolsandbox/mvlad/split-v3-update
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Id19a1865baef6e7c9804a281d583a4ac19421851
Diffstat (limited to 'src/layout.c')
| -rw-r--r-- | src/layout.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/layout.c b/src/layout.c index 5d24a1f..df632d8 100644 --- a/src/layout.c +++ b/src/layout.c @@ -47,6 +47,7 @@ static const char *ivi_roles_as_string[] = { [IVI_SURFACE_ROLE_SPLIT_V] = "SPLIT_V", [IVI_SURFACE_ROLE_FULLSCREEN] = "FULLSCREEN", [IVI_SURFACE_ROLE_REMOTE] = "REMOTE", + [IVI_SURFACE_ROLE_TILE] = "TILE", }; const char * @@ -206,6 +207,10 @@ ivi_layout_activate_complete(struct ivi_output *output, woutput->x + output->area.x, woutput->y + output->area.y); + surf->orientation = AGL_SHELL_TILE_ORIENTATION_NONE; + weston_desktop_surface_set_orientation(surf->dsurface, + surf->orientation); + view->is_mapped = true; surf->mapped = true; view->surface->is_mapped = true; @@ -804,10 +809,16 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) return; } + /* reset tile to desktop to allow to resize correctly */ + if (surf->role == IVI_SURFACE_ROLE_TILE && output->active == surf) + surf->role = IVI_SURFACE_ROLE_DESKTOP; + /* do not 're'-activate surfaces that are split or active */ - if (surf == output->active || - ivi_layout_surface_is_split_or_fullscreen(surf)) + if ((surf == output->active && surf->role != IVI_SURFACE_ROLE_DESKTOP) || + ivi_layout_surface_is_split_or_fullscreen(surf)) { + weston_log("Found split || fullscreen surface. Refusing to activate!\n"); return; + } if (surf->role == IVI_SURFACE_ROLE_REMOTE) { struct ivi_output *remote_output = @@ -883,6 +894,8 @@ ivi_layout_get_output_from_surface(struct ivi_surface *surf) break; case IVI_SURFACE_ROLE_NONE: default: + if (surf->view->output) + return to_ivi_output(surf->view->output); break; } |