summaryrefslogtreecommitdiffstats
path: root/src/layout.c
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2020-06-01 20:17:23 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-06-15 10:09:11 +0000
commit7af3d3760c29157282348648d893af285b7efb34 (patch)
tree399f242a70d5fa85cd234d24ff0d383bae3d3379 /src/layout.c
parentb491db3111b98e008a31ac817b9987db1b47f35f (diff)
desktop: Remove commiting code for the panel
We no longer use older qtwayland version so there's no need to keep in place anymore. Bug-AGl: SPEC-3280 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Icad3d208ea96739b780dfef5911e855a7a39af6a
Diffstat (limited to 'src/layout.c')
-rw-r--r--src/layout.c67
1 files changed, 0 insertions, 67 deletions
diff --git a/src/layout.c b/src/layout.c
index 079325e..ea1e684 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -581,73 +581,6 @@ ivi_layout_popup_re_add(struct ivi_surface *surface)
ivi_layout_popup_committed(surface);
}
-void
-ivi_layout_panel_committed(struct ivi_surface *surface)
-{
- struct ivi_compositor *ivi = surface->ivi;
- struct ivi_output *output = surface->bg.output;
- struct weston_output *woutput = output->output;
- struct weston_desktop_surface *dsurface = surface->dsurface;
- struct weston_surface *wsurface =
- weston_desktop_surface_get_surface(dsurface);
- struct weston_geometry geom;
- int x = woutput->x;
- int y = woutput->y;
-
- assert(surface->role == IVI_SURFACE_ROLE_PANEL);
-
- /*
- * If the desktop_surface geometry is not set and the panel is not a
- * top one, we'll give this a chance to run, as some qtwayland version
- * seem to have a 'problem', where the panel initilization part will
- * have a desktop surface with 0 as geometry for *all* its members
- * (width/height). Doing that will result in the panel not being
- * displayed at all.
- *
- * Later versions of qtwayland do have the correct window geometry for
- * the desktop surface so the weston_surface is already mapped in
- * ivi_panel_init().
- */
- if (wsurface->is_mapped)
- return;
-
- geom = weston_desktop_surface_get_geometry(dsurface);
-
-#ifdef AGL_COMP_DEBUG
- weston_log("geom.width %d, geom.height %d, geom.x %d, geom.y %d\n",
- geom.width, geom.height, geom.x, geom.y);
-#endif
-
- switch (surface->panel.edge) {
- case AGL_SHELL_EDGE_TOP:
- /* Do nothing */
- break;
- case AGL_SHELL_EDGE_BOTTOM:
- y += woutput->height - geom.height;
- break;
- case AGL_SHELL_EDGE_LEFT:
- /* Do nothing */
- break;
- case AGL_SHELL_EDGE_RIGHT:
- x += woutput->width - geom.width;
- break;
- }
-#ifndef AGL_COMP_DEBUG
- weston_log("panel type %d commited\n", surface->panel.edge);
-#endif
-
- weston_view_set_output(surface->view, woutput);
- weston_view_set_position(surface->view, x, y);
- weston_layer_entry_insert(&ivi->panel.view_list,
- &surface->view->layer_link);
-
- weston_view_update_transform(surface->view);
- weston_view_schedule_repaint(surface->view);
-
- wsurface->is_mapped = true;
- surface->view->is_mapped = true;
-}
-
static bool
ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf)
{