openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2025-02-17 06:19:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!10821 修改窗口可绘制状态

Browse Source 
Merge pull request !10821 from ZihaoWU/wzh1115HAP
This commit is contained in:
openharmony_ci 2024-11-15 15:06:36 +00:00 committed by Gitee
commit 91db42dfb6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1059,11 +1059,10 @@ private:
* Window Property
*/
struct DrawingSessionInfo {
uint64_t surfaceId_ = 0;
int32_t pid_ = 0;
int32_t uid_ = 0;
};
std::vector<DrawingSessionInfo> lastDrawingSessionInfoVec_;
std::unordered_map<uint64_t, DrawingSessionInfo> lastDrawingSessionInfoMap_;
/**
* PC Window

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

@ -8004,11 +8004,10 @@ void SceneSessionManager::DealwithDrawingContentChange(const std::vector<std::pa
bool SceneSessionManager::GetSpecifiedDrawingData(uint64_t surfaceId, int32_t& pid, int32_t& uid)
{
auto it = std::find_if(lastDrawingSessionInfoVec_.begin(), lastDrawingSessionInfoVec_.end(),
[surfaceId](const DrawingSessionInfo& info) { return info.surfaceId_ == surfaceId; });
if (it != lastDrawingSessionInfoVec_.end()) {
pid = it->pid_;
uid = it->uid_;
auto it = lastDrawingSessionInfoMap_.find(surfaceId);
if (it != lastDrawingSessionInfoMap_.end()) {
pid = it->second.pid_;
uid = it->second.uid_;
return true;
}
return false;
@ -8016,10 +8015,9 @@ bool SceneSessionManager::GetSpecifiedDrawingData(uint64_t surfaceId, int32_t& p
void SceneSessionManager::RemoveSpecifiedDrawingData(uint64_t surfaceId)
{
auto it = std::find_if(lastDrawingSessionInfoVec_.begin(), lastDrawingSessionInfoVec_.end(),
[surfaceId](const DrawingSessionInfo& info) { return info.surfaceId_ == surfaceId; });
if (it != lastDrawingSessionInfoVec_.end()) {
lastDrawingSessionInfoVec_.erase(it);
auto it = lastDrawingSessionInfoMap_.find(surfaceId);
if (it != lastDrawingSessionInfoMap_.end()) {
lastDrawingSessionInfoMap_.erase(it);
}
}
@ -8029,11 +8027,10 @@ std::vector<std::pair<uint64_t, bool>> SceneSessionManager::GetWindowDrawingCont
std::vector<std::pair<uint64_t, bool>> processDrawingContentChangeInfo;
for (const auto& [surfaceId, isWindowDrawing] : currDrawingContentData) {
int32_t pid = 0;
bool isPreWindowDrawing = GetPreWindowDrawingState(surfaceId, isWindowDrawing, pid);
bool isProcessDrawingStateChanged = GetProcessDrawingState(surfaceId, pid);
sptr<SceneSession> session = SelectSesssionFromMap(surfaceId);
bool isDrawingStateChanged =
session == nullptr || (isPreWindowDrawing != isWindowDrawing && isProcessDrawingStateChanged);
session == nullptr || (GetPreWindowDrawingState(surfaceId, isWindowDrawing, pid) != isWindowDrawing &&
GetProcessDrawingState(surfaceId, pid));
if (isDrawingStateChanged) {
processDrawingContentChangeInfo.emplace_back(surfaceId, isWindowDrawing);
}
@ -8056,8 +8053,7 @@ bool SceneSessionManager::GetPreWindowDrawingState(uint64_t surfaceId, bool curr
void SceneSessionManager::UpdateWindowDrawingData(uint64_t surfaceId, int32_t pid, int32_t uid)
{
RemoveSpecifiedDrawingData(surfaceId);
lastDrawingSessionInfoVec_.push_back({ surfaceId, pid, uid });
lastDrawingSessionInfoMap_[surfaceId] = { pid, uid };
}
bool SceneSessionManager::GetProcessDrawingState(uint64_t surfaceId, int32_t pid)