diff options
author | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2018-08-31 09:27:22 +0900 |
---|---|---|
committer | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2018-08-31 09:27:22 +0900 |
commit | 9f4fb3b34b4b8152c4355b735c5b7a3825086c4b (patch) | |
tree | e76c2929855cbb6b7143040e70cd68b8be5ad0ff /src/window_manager.cpp | |
parent | 59844dbc6fd2676d69cba702a9c43ffbc625a5d5 (diff) | |
parent | 8f0f90cbffda62b8bc3283f6987a82d34b78e921 (diff) |
Merge branch 'sandbox/knimitz/layer_with_pm_tmp' into sandbox/knimitz/layer_with_pm
Fix build error
Change-Id: I951b531440aee655c8be77d82971f1c1bffe81a8
Diffstat (limited to 'src/window_manager.cpp')
-rw-r--r-- | src/window_manager.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/window_manager.cpp b/src/window_manager.cpp index ea3c794..95b0d5a 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -470,14 +470,11 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_ } auto client = g_app_list.lookUpClient(id); - unsigned srfc = client->surfaceID(role); - if(srfc == 0) - { - HMI_ERROR("role sould be set with surface"); - reply("role sould be set with surface"); - return; - } - g_app_list.removeFloatingSurface(client->surfaceID()); + // unsigned srfc = client->surfaceID(role); + // unsigned layer = client->layerID(); + + // g_app_list.removeFloatingSurface(client->surfaceID()); + // g_app_list.removeFloatingSurface(client); Task task = Task::TASK_ALLOCATE; unsigned req_num = 0; @@ -1321,14 +1318,14 @@ WMError WindowManager::doEndDraw(unsigned req_num) if(!g_app_list.contains(act.appid)){ ret = WMError::NOT_REGISTERED; } - ret = this->layoutChange(act); + ret = this->lc->layoutChange(act); if(ret != WMError::SUCCESS) { HMI_SEQ_WARNING(req_num, "Failed to manipulate surfaces while state change : %s", errorDescription(ret)); return ret; } - ret = this->visibilityChange(act); + ret = this->lc->visibilityChange(act); if (ret != WMError::SUCCESS) { HMI_SEQ_WARNING(req_num, @@ -1339,7 +1336,7 @@ WMError WindowManager::doEndDraw(unsigned req_num) //this->lc_enddraw(act.role.c_str()); } } - this->layout_commit(); + this->lc->commitChange(); HMI_SEQ_INFO(req_num, "emit flushDraw"); |