From 7af3d3760c29157282348648d893af285b7efb34 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 1 Jun 2020 20:17:23 +0300 Subject: [PATCH] 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 Change-Id: Icad3d208ea96739b780dfef5911e855a7a39af6a --- src/desktop.c | 4 +--- src/ivi-compositor.h | 3 --- src/layout.c | 67 ---------------------------------------------------- 3 files changed, 1 insertion(+), 73 deletions(-) diff --git a/src/desktop.c b/src/desktop.c index f8c614f..3dc1ceb 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -221,9 +221,6 @@ desktop_committed(struct weston_desktop_surface *dsurface, case IVI_SURFACE_ROLE_REMOTE: ivi_layout_desktop_committed(surface); break; - case IVI_SURFACE_ROLE_PANEL: - ivi_layout_panel_committed(surface); - break; case IVI_SURFACE_ROLE_POPUP: ivi_layout_popup_committed(surface); break; @@ -236,6 +233,7 @@ desktop_committed(struct weston_desktop_surface *dsurface, break; case IVI_SURFACE_ROLE_NONE: case IVI_SURFACE_ROLE_BACKGROUND: + case IVI_SURFACE_ROLE_PANEL: default: /* fall through */ break; } diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h index bc3a81d..d6b6c80 100644 --- a/src/ivi-compositor.h +++ b/src/ivi-compositor.h @@ -327,9 +327,6 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id); void ivi_layout_desktop_committed(struct ivi_surface *surf); -void -ivi_layout_panel_committed(struct ivi_surface *surface); - void ivi_layout_popup_committed(struct ivi_surface *surface); 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) { -- 2.16.6