openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2024-12-04 05:03:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改检视意见

Browse Source 
Signed-off-by: w00845523 <13643413997@163.com>
This commit is contained in:
w00845523 2024-11-21 15:31:34 +08:00
parent 26289e65e1
commit bb01e2da13
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
window_scene/session_manager/include/scene_session_manager.h
View File

@ -940,7 +940,6 @@ private:
* PiP Window
*/
uint64_t pipSurfaceId_;
sptr<SceneSession> pipSession_;
bool CheckPiPPriority(const PiPTemplateInfo& pipTemplateInfo);
bool isEnablePiPCreate(const sptr<WindowSessionProperty>& property);
bool OcclusionPiPWindow(const uint64_t surfaceId, const WindowVisibilityState visibilityState);

22
window_scene/session_manager/src/scene_session_manager.cpp
View File

@ -2636,7 +2636,8 @@ bool SceneSessionManager::isEnablePiPCreate(const sptr<WindowSessionProperty>& p
void SceneSessionManager::NotifyPiPWindowVisibleChange() {
std::vector<std::pair<uint64_t, WindowVisibilityState>> pipVisibilityChangeInfos;
if (pipSession_ != nullptr) {
sptr<SceneSession> session = SelectSesssionFromMap(pipSurfaceId_);
if (session != nullptr) {
if (isScreenLocked_) {
pipVisibilityChangeInfos.emplace_back(pipSurfaceId_, WINDOW_VISIBILITY_STATE_TOTALLY_OCCUSION);
} else {
@ -2648,13 +2649,18 @@ void SceneSessionManager::NotifyPiPWindowVisibleChange() {
bool SceneSessionManager::OcclusionPiPWindow(const uint64_t surfaceId, const WindowVisibilityState visibilityState) {
sptr<SceneSession> session = SelectSesssionFromMap(surfaceId);
if (session!= nullptr && session->GetWindowMode() == WindowMode::WINDOW_MODE_PIP && !isScreenLocked_ &&
session->GetSessionState() == SessionState::STATE_ACTIVE &&
visibilityState != WINDOW_VISIBILITY_STATE_TOTALLY_OCCUSION) {
TLOGI(WmsLogTag::WMS_PIP, "pipWindow occlusion. pipSurfaceId_: %{public}" PRIu64, surfaceId);
if (session == nullptr || session->GetWindowMode() != WindowMode::WINDOW_MODE_PIP) {
TLOGI(WmsLogTag::WMS_PIP, "session is null or sessionWindowMode is not PIP");
return false;
}
if (isScreenLocked_) {
TLOGI(WmsLogTag::WMS_PIP, "pipWindow occlusion because of screen locked");
return false;
}
if (visibilityState != WINDOW_VISIBILITY_STATE_TOTALLY_OCCUSION) {
// no visibility notification processing after pip is occlusion
TLOGI(WmsLogTag::WMS_PIP, "pipWindow occlusion success. pipSurfaceId_: %{public}" PRIu64, surfaceId);
pipSurfaceId_ = surfaceId;
pipSession_ = session;
return true;
}
return false;
@ -8203,10 +8209,6 @@ void SceneSessionManager::WindowDestroyNotifyVisibility(const sptr<SceneSession>
WLOGFE("sceneSession is nullptr!");
return;
}
if (sceneSession->GetWindowMode() == WindowMode::WINDOW_MODE_PIP) {
TLOGI(WmsLogTag::WMS_PIP, "pipWindow destroyed");
pipSession_ = nullptr;
}
if (sceneSession->GetRSVisible() || sceneSession->GetWindowMode() == WindowMode::WINDOW_MODE_PIP) {
std::vector<sptr<WindowVisibilityInfo>> windowVisibilityInfos;
#ifdef MEMMGR_WINDOW_ENABLE