openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-18 16:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix issue

Browse Source 
Signed-off-by: Grady <yangguangwei4@huawei.com>
Change-Id: Iea4af47fc1d57ac5c5fe41a334ec4072406f8162
This commit is contained in:
Grady
2022-03-10 17:12:41 +08:00
parent 85eb256ab3
commit dc4157a7a9
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dmserver/src/abstract_screen_controller.cpp
+6 -3
View File
@@ -70,7 +70,7 @@ std::vector<ScreenId> AbstractScreenController::GetAllScreenIds()
std::lock_guard<std::recursive_mutex> lock(mutex_);
std::vector<ScreenId> res;
for (auto iter = dmsScreenMap_.begin(); iter != dmsScreenMap_.end(); iter++) {
res.push_back(iter->first);
res.emplace_back(iter->first);
}
return res;
}
@@ -132,6 +132,9 @@ std::shared_ptr<RSDisplayNode> AbstractScreenController::GetRSDisplayNodeByScree
if (screen == nullptr) {
return nullptr;
}
if (screen->rsDisplayNode_ == nullptr) {
return nullptr;
}
WLOGI("GetRSDisplayNodeByScreenId: screen: %{public}" PRIu64", nodeId: %{public}" PRIu64" ",
screen->dmsId_, screen->rsDisplayNode_->GetId());
return screen->rsDisplayNode_;
@@ -335,7 +338,7 @@ bool AbstractScreenController::FillAbstractScreen(sptr<AbstractScreen>& absScree
info->width_ = static_cast<uint32_t>(rsScreenModeInfo.GetScreenWidth());
info->height_ = static_cast<uint32_t>(rsScreenModeInfo.GetScreenHeight());
info->refreshRate_ = rsScreenModeInfo.GetScreenFreshRate();
absScreen->modes_.push_back(info);
absScreen->modes_.emplace_back(info);
WLOGD("fill screen w/h:%{public}d/%{public}d", info->width_, info->height_);
}
int32_t activeModeId = rsInterface_.GetScreenActiveMode(rsScreenId).GetScreenModeId();
@@ -484,7 +487,7 @@ ScreenId AbstractScreenController::CreateVirtualScreen(VirtualScreenOption optio
if (defaultScreen != nullptr && defaultScreen->GetActiveScreenMode() != nullptr) {
info->refreshRate_ = defaultScreen->GetActiveScreenMode()->refreshRate_;
}
absScreen->modes_.push_back(info);
absScreen->modes_.emplace_back(info);
absScreen->activeIdx_ = 0;
absScreen->type_ = ScreenType::VIRTUAL;
dmsScreenMap_.insert(std::make_pair(dmsScreenId, absScreen));