From f7536d2b6ff552e7c4849b36d9b6e140c5b1b9aa Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Fri, 2 Aug 2019 15:37:49 +0900 Subject: fix for als2019 8.0.0 --- package/root/config.xml | 4 ++-- src/window_manager.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/root/config.xml b/package/root/config.xml index e11ef63..d15750b 100644 --- a/package/root/config.xml +++ b/package/root/config.xml @@ -8,12 +8,12 @@ - + - + diff --git a/src/window_manager.cpp b/src/window_manager.cpp index 6955131..52a7144 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -529,7 +529,6 @@ void WindowManager::api_activate_window(char const *appid, char const *drawing_n // g_app_list.removeFloatingSurface(client);i unsigned layer = client->layerID(); -#if 0 //TODO Deactivate remote viewing app for remote view change to local view. if(this->lc->hasRemoteLayer(layer) != "" && this->wmcon.getAppIdToEcuName(appid) != "") { @@ -558,7 +557,6 @@ void WindowManager::api_activate_window(char const *appid, char const *drawing_n this->emit_invisible(role); this->emit_deactivated(role); } -#endif Task task = Task::TASK_ALLOCATE; unsigned req_num = 0; @@ -694,7 +692,7 @@ void WindowManager::api_activate_surface_to_master( // g_app_list.removeFloatingSurface(client); unsigned layer = client->layerID(); -#if 0 + //TODO Deactivate remote viewing app for remote view change to local view. if(this->lc->hasRemoteLayer(layer) != "" && this->wmcon.getAppIdToEcuName(appid) != "") { @@ -723,7 +721,7 @@ void WindowManager::api_activate_surface_to_master( this->emit_invisible(role); this->emit_deactivated(role); } -#endif + Task task = Task::TASK_ALLOCATE; unsigned req_num = 0; WMError ret = WMError::UNKNOWN; -- cgit 1.2.3-korg