From ea2edb72018278f8702d3a84fd30285bccc392c4 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Mon, 11 Jun 2018 10:19:41 +0900 Subject: [PATCH] Fix bug Change-Id: I5cf922050095dca3dd304acbc25e4b62d2113ab1 Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 8 ++++---- src/wayland_ivi_wm.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app.cpp b/src/app.cpp index 1422750..897dee7 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -1146,10 +1146,6 @@ void App::send_event(char const *evname, char const *label, char const *area, */ void App::surface_created(uint32_t surface_id) { - // For set role function - HMI_DEBUG("wm", "Get surface pid"); - this->controller->get_surface_properties(surface_id); - auto layer_id = this->layers.get_layer_id(surface_id); if (!layer_id) { @@ -1162,6 +1158,10 @@ void App::surface_created(uint32_t surface_id) this->controller->layers[*layer_id]->add_surface(surface_id); this->layout_commit(); + // For set role function + HMI_DEBUG("wm", "Get surface pid"); + this->controller->get_surface_properties(surface_id); + // activate the main_surface right away /*if (surface_id == static_cast(this->layers.main_surface)) { HMI_DEBUG("wm", "Activating main_surface (%d)", surface_id); diff --git a/src/wayland_ivi_wm.cpp b/src/wayland_ivi_wm.cpp index 7e94208..926f0d3 100644 --- a/src/wayland_ivi_wm.cpp +++ b/src/wayland_ivi_wm.cpp @@ -537,7 +537,7 @@ void controller::create_screen(struct wl_output *output) void controller::get_surface_properties(uint32_t surface_id, int param) { if(param == 0){ - param = IVI_WM_PARAM_OPACITY | IVI_WM_PARAM_VISIBILITY | IVI_WM_PARAM_SIZE; + //param = IVI_WM_PARAM_OPACITY | IVI_WM_PARAM_VISIBILITY | IVI_WM_PARAM_SIZE; } ivi_wm_surface_get(this->proxy.get(), surface_id, param); } @@ -616,7 +616,7 @@ void controller::surface_stats_received(struct surface *s, uint32_t surface_id, { HMI_DEBUG("wm", "compositor::surface %s @ %d f %u pid %u", __func__, surface_id, frame_count, pid); - this->sprops[s->id].id = pid; + //this->sprops[s->id].id = pid; this->chooks->surface_properties(surface_id, pid); } -- 2.16.6