openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2025-02-14 12:39:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change7

Browse Source 
Signed-off-by: 卢宇豪 <luyuhao6@huawei.com>
This commit is contained in:
卢宇豪 2024-12-28 21:16:59 +08:00
parent 99b56e2198
commit d07342b491
6 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
interfaces/innerkits/wm/wm_common.h
View File

@ -1192,6 +1192,7 @@ struct TitleButtonRect {
/**
* Config of keyboard animation
*/
class KeyboardAnimationCurve : public Parcelable {
public:
KeyboardAnimationCurve() = default;

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

@ -10499,7 +10499,7 @@ void SceneSessionManager::NotifyUpdateRectAfterLayout()
WMError SceneSessionManager::GetAllWindowLayoutInfo(std::vector<sptr<WindowLayoutInfo>>& infos)
{
auto task = [inputDisplayId, this, &infos]() {
auto task = [inputDisplayId, this, &infos] {
bool isVirtualDisplay = false;
DisplayId displayId = inputDisplayId;
if (displayId == VIRTUAL_DISPLAYID) {
@ -10510,17 +10510,17 @@ WMError SceneSessionManager::GetAllWindowLayoutInfo(std::vector<sptr<WindowLayou
for (auto& iter : sceneSessionMap_) {
auto session = iter.second;
if (session == nullptr || !IsWindowLayoutInfoNeeded(session) ||
session->GetSessionProperty()->GetDisplayId() != displayId ||
(!isVirtualDisplay && displayId == 0 && !IsOnVirtualDisplay(session)) ||
(isVirtualDisplay && displayId == 0 && !IsVirtualDisplayShow(session)) ||
session->GetVisibilityState() == WINDOW_VISIBILITY_STATE_TOTALLY_OCCUSION) {
session->GetSessionProperty()->GetDisplayId() != displayId ||
(!isVirtualDisplay && displayId == 0 && !IsOnVirtualDisplay(session)) ||
(isVirtualDisplay && displayId == 0 && !IsVirtualDisplayShow(session)) ||
session->GetVisibilityState() == WINDOW_VISIBILITY_STATE_TOTALLY_OCCUSION) {
continue;
}
processomhSessions.emplace_back(iter);
}
CmpFunc cmp = [](std::pair<int32_t, sptr<SceneSession>>& lhs, std::pair<int32_t, sptr<SceneSession>>& rhs) {
uint32_t lhsZOrder = lhs.second != nullptr ? lhs.second->GetZOrder() : 0;
uint32_t lhsZOrder = rhs.second != nullptr ? rhs.second->GetZOrder() : 0;
uint32_t rhsZOrder = rhs.second != nullptr ? rhs.second->GetZOrder() : 0;
return lhsZOrder > rhsZOrder;
};
std::sort(processingSessions.begin(), processingSessions.end(), cmp);
@ -10528,7 +10528,7 @@ WMError SceneSessionManager::GetAllWindowLayoutInfo(std::vector<sptr<WindowLayou
auto session = iter.second;
WSRect hostRect;
if (!systemConfig_.IsPcWindow()) {
Rect GlobalRect;
Rect globalRect;
session->GetGlobalScaledRect(globalRect);
hostRect = { globalRect.posX_, globalRect.posY_, globalRect.width_, globalRect.height_ };
} else {
@ -10540,11 +10540,10 @@ WMError SceneSessionManager::GetAllWindowLayoutInfo(std::vector<sptr<WindowLayou
Rect rect = { hostRect.posX_, hostRect.posY_,
static_cast<uint32_t>(hostRect.width_), static_cast<uint32_t>(hostRect.height_) };
infos.emplace_back(sptr<WindowLayoutInfo>::MakeSptr(rect));
TLOGND(WmsLogTag::WMS_ATTRIBUTE, "filted widnow name: %{pubilc}s", session->GetWindowName().c_str());
}
return WMError::WM_OK;
};
return taskScheduler_->PostSyncTask(task, "GetAllWindowLayoutInfo");
return taskScheduler_->PostSyncTask(task, __func__);
}
bool SceneSessionManager::IsWindowLayoutInfoNeeded(sptr<SceneSesion> session)
@ -10565,11 +10564,11 @@ bool SceneSessionManager::IsOnVirtualDisplay(sptr<SceneSesion> session)
{
const auto& [defaultDisplayRect, virtualDisplayRect, foldCreaseRect] =
PcFoldScreenManager::GetInstance().GetDisplayRects();
const int32_t SUPER_FOLD_DIVIDE_FACTOR = 2;
constexpr int32_t SUPER_FOLD_DIVIDE_FACTOR = 2;
int32_t lowerScreenPosY =
defaultDisplayRect.height_ - foldCreaseRect.height_ / SUPER_FOLD_DIVIDE_FACTOR + foldCreaseRect.height_;
if (PcFoldScreenManager::GetInstance().GetScreenFoldStatus() == SuperFoldStatus::HALF_FOLDED &&
session->GetSessionRect().posY_ < lowerScreenPosY) {
session->GetSessionRect().posY_ < lowerScreenPosY) {
return true;
}
return false;
@ -10579,7 +10578,7 @@ bool SceneSessionManager::IsVirtualDisplayShow(sptr<SceneSesion> session)
{
const auto& [defaultDisplayRect, virtualDisplayRect, foldCreaseRect] =
PcFoldScreenManager::GetInstance().GetDisplayRects();
const int32_t SUPER_FOLD_DIVIDE_FACTOR = 2;
constexpr int32_t SUPER_FOLD_DIVIDE_FACTOR = 2;
int32_t lowerScreenPosY =
defaultDisplayRect.height_ - foldCreaseRect.height_ / SUPER_FOLD_DIVIDE_FACTOR + foldCreaseRect.height_;
if (PcFoldScreenManager::GetInstance().GetScreenFoldStatus() == SuperFoldStatus::HALF_FOLDED &&

4
window_scene/session_manager/src/zidl/scene_session_manager_stub.cpp
View File

@ -1102,13 +1102,13 @@ int SceneSessionManagerStub::HandleGetAllWindowLayoutInfo(MessageParcel& data, M
{
uint64_t displayId = 0;
if (!data.ReadUint64(displayId)) {
TLOGE(WmsLogTag::WMS_ATTRIBUTE, "Failed to readInt32 displayId");
TLOGE(WmsLogTag::WMS_ATTRIBUTE, "Failed to read displayId");
return ERR_INVALID_DATA;
}
std::vector<sptr<WindowLayoutInfo>> infos;
WMError errCode = GetAllWindowLayoutInfo(displayId, infos);
if (!MarshallingHelper::MarshallingVectorParcelableObj<WindowLayoutInfo>(reply, infos)) {
TLOGE(WmsLogTag::WMS_ATTRIBUTE, "write window layout info failed");
TLOGE(WmsLogTag::WMS_ATTRIBUTE, "Failed to Write window layout info");
return ERR_INVALID_DATA;
}
reply.WriteInt32(static_cast<int32_t>(errCode));

1
wm/src/window_adapter.cpp
View File

@ -188,7 +188,6 @@ WMError WindowAdapter::GetUnreliableWindowInfo(int32_t windowId,
WMError WindowAdapter::GetAllWindowLayoutInfo(DisplayId displayId, std::vector<sptr<WindowLayoutInfo>>& infos)
{
INIT_PROXY_CHECK_RETURN(WMError::WM_ERROR_SAMGR);
auto wmsProxy = GetWindowManagerServiceProxy();
CHECK_PROXY_RETURN_ERROR_IF_NULL(wmsProxy, WMError::WM_ERROR_SAMGR);
return wmsProxy->GetAllWindowLayoutInfo(displayId, infos);

2
wm/src/window_manager.cpp
View File

@ -1123,7 +1123,7 @@ WMError WindowManager::GetAllWindowLayoutInfo(DisplayId displayId, std::vector<s
{
WMError ret = SingletonContainer::Get<WindowAdapter>().GetAllWindowLayoutInfo(displayId, infos);
if (ret != WMError::WM_OK) {
WLOGFE("get window visibility info failed");
WLOGFE("get window layout info failed");
}
return ret;
}

8
wmserver/src/window_manager_service.cpp
View File

@ -1425,14 +1425,6 @@ WMError WindowManagerService::GetUnreliableWindowInfo(int32_t windowId,
return PostSyncTask(task, "GetUnreliableWindowInfo");
}
WMError WindowManagerService::GetAllWindowLayoutInfo(std::vector<sptr<WindowLayoutInfo>>& infos)
{
auto task = [this, &infos]() {
return windowController_->GetAllWindowLayoutInfo(infos);
};
return PostSyncTask(task, "GetAllWindowLayoutInfo");
}
WMError WindowManagerService::GetVisibilityWindowInfo(std::vector<sptr<WindowVisibilityInfo>>& infos)
{
auto task = [this, &infos]() {