openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-19 17:08:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

!1157 refactor accessibility info for wms

Browse Source 
Merge pull request !1157 from xiahaiqin/master
This commit is contained in:
openharmony_ci
2022-07-20 08:58:08 +00:00
committed by Gitee
parent 38cfadfbca b1e08c6a0c
commit 49a64c3a46
11 changed files with 210 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wm/src/window_manager.cpp
+3 -3
View File
@@ -271,15 +271,15 @@ void WindowManager::Impl::NotifyAccessibilityWindowInfo(const sptr<Accessibility
WLOGFE("windowInfo is nullptr");
return;
}
WLOGFI("NotifyAccessibilityWindowInfo: wid[%{public}d], width[%{public}d]," \
WLOGFI("NotifyAccessibilityWindowInfo: wid[%{public}u], width[%{public}d]," \
"height[%{public}d], positionX[%{public}d], positionY[%{public}d]," \
"isFocused[%{public}d], isDecorEnable[%{public}d], displayId[%{public}" PRIu64"]," \
"mode[%{public}d], type[%{public}d]",
"mode[%{public}u], type[%{public}u, updateType[%{public}d]",
windowInfo->currentWindowInfo_->wid_, windowInfo->currentWindowInfo_->windowRect_.width_,
windowInfo->currentWindowInfo_->windowRect_.height_, windowInfo->currentWindowInfo_->windowRect_.posX_,
windowInfo->currentWindowInfo_->windowRect_.posY_, windowInfo->currentWindowInfo_->focused_,
windowInfo->currentWindowInfo_->isDecorEnable_, windowInfo->currentWindowInfo_->displayId_,
windowInfo->currentWindowInfo_->mode_, windowInfo->currentWindowInfo_->type_);
windowInfo->currentWindowInfo_->mode_, windowInfo->currentWindowInfo_->type_, type);
std::vector<sptr<IWindowUpdateListener>> windowUpdateListeners;
{
std::lock_guard<std::recursive_mutex> lock(mutex_);
wmserver/BUILD.gn
+1
View File
@@ -32,6 +32,7 @@ ohos_shared_library("libwms") {
sources = [
"../wm/src/zidl/window_manager_agent_proxy.cpp",
"../wm/src/zidl/window_proxy.cpp",
"src/accessibility_connection.cpp",
"src/avoid_area_controller.cpp",
"src/display_group_controller.cpp",
"src/display_group_info.cpp",
wmserver/include/accessibility_connection.h
+45
View File
@@ -0,0 +1,45 @@
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_ROSEN_ACCESSIBILITY_CONNECTION_H
#define OHOS_ROSEN_ACCESSIBILITY_CONNECTION_H
#include <refbase.h>
#include <map>
#include <vector>
#include "window_node.h"
#include "window_root.h"
#include "window_node_container.h"
#include "wm_common.h"
namespace OHOS::Rosen {
class AccessibilityConnection : public RefBase {
public:
explicit AccessibilityConnection(sptr<WindowRoot>& root) : windowRoot_(root) {}
~AccessibilityConnection() = default;
void NotifyAccessibilityInfo(const sptr<WindowNode>& node, WindowUpdateType type);
void GetAccessibilityWindowInfo(sptr<AccessibilityWindowInfo>& windowInfo) const;
private:
sptr<WindowRoot> windowRoot_;
std::map<sptr<WindowNodeContainer>, uint32_t> focusedWindowMap_;
void NotifyAccessibilityWindowInfo(const sptr<WindowNodeContainer>& container, const sptr<WindowNode>& node,
WindowUpdateType type) const;
void GetWindowList(const sptr<WindowNodeContainer>& container, std::vector<sptr<WindowInfo>>& windowList) const;
void FillWindowInfo(const sptr<WindowNode>& node, uint32_t focusedWindow, sptr<WindowInfo>& windowInfo) const;
};
}
#endif // OHOS_ROSEN_ACCESSIBILITY_CONTROLLER_H
wmserver/include/window_controller.h
+6 -1
View File
@@ -18,6 +18,8 @@
#include <refbase.h>
#include <rs_iwindow_animation_controller.h>
#include "accessibility_connection.h"
#include "input_window_monitor.h"
#include "zidl/window_manager_agent_interface.h"
#include "window_root.h"
@@ -29,7 +31,7 @@ namespace Rosen {
class WindowController : public RefBase {
public:
WindowController(sptr<WindowRoot>& root, sptr<InputWindowMonitor> inputWindowMonitor) : windowRoot_(root),
inputWindowMonitor_(inputWindowMonitor) {}
inputWindowMonitor_(inputWindowMonitor), accessibilityConnection_(new AccessibilityConnection(windowRoot_)) {}
~WindowController() = default;
WMError CreateWindow(sptr<IWindow>& window, sptr<WindowProperty>& property,
@@ -64,6 +66,8 @@ public:
sptr<RSIWindowAnimationFinishedCallback>& finishCallback);
Orientation GetWindowPreferredOrientation(DisplayId displayId);
void OnScreenshot(DisplayId displayId);
WMError GetAccessibilityWindowInfo(sptr<AccessibilityWindowInfo>& windowInfo) const;
private:
uint32_t GenWindowId();
void FlushWindowInfo(uint32_t windowId);
@@ -92,6 +96,7 @@ private:
sptr<WindowRoot> windowRoot_;
sptr<InputWindowMonitor> inputWindowMonitor_;
sptr<AccessibilityConnection> accessibilityConnection_;
std::atomic<uint32_t> windowId_ { INVALID_WINDOW_ID };
// Remove 'sysBarWinId_' after SystemUI resize 'systembar', systemBar only exist on default display currently
std::unordered_map<WindowType, uint32_t> sysBarWinId_ {
wmserver/include/window_node_container.h
-3
View File
@@ -62,7 +62,6 @@ public:
uint64_t GetScreenId(DisplayId displayId) const;
Rect GetDisplayRect(DisplayId displayId) const;
std::unordered_map<WindowType, SystemBarProperty> GetExpectImmersiveProperty() const;
void NotifyAccessibilityWindowInfo(const sptr<WindowNode>& windowId, WindowUpdateType type) const;
uint32_t GetWindowCountByType(WindowType windowType);
bool IsForbidDockSliceMove(DisplayId displayId) const;
bool IsDockSliceInExitSplitModeArea(DisplayId displayId) const;
@@ -90,7 +89,6 @@ public:
Rect GetDisplayGroupRect() const;
void TraverseWindowTree(const WindowNodeOperationFunc& func, bool isFromTopToBottom = true) const;
void UpdateSizeChangeReason(sptr<WindowNode>& node, WindowSizeChangeReason reason);
void GetWindowList(std::vector<sptr<WindowInfo>>& windowList) const;
void DropShowWhenLockedWindowIfNeeded(const sptr<WindowNode>& node);
void SetMinimizedByOther(bool isMinimizedByOther);
@@ -151,7 +149,6 @@ private:
void UpdateRSTreeWhenShowingDisplaysChange(sptr<WindowNode>& node,
const std::vector<DisplayId>& lastShowingDisplays,
const std::vector<DisplayId>& curShowingDisplays);
void FillWindowInfo(sptr<WindowInfo>& windowInfo, const sptr<WindowNode>& node) const;
bool CheckWindowNodeWhetherInWindowTree(const sptr<WindowNode>& node) const;
void UpdateModeSupportInfoWhenKeyguardChange(const sptr<WindowNode>& node, bool up);
wmserver/include/window_root.h
-1
View File
@@ -84,7 +84,6 @@ public:
void SetBrightness(uint32_t windowId, float brightness);
void HandleKeepScreenOn(uint32_t windowId, bool requireLock);
void UpdateFocusableProperty(uint32_t windowId);
WMError GetAccessibilityWindowInfo(sptr<AccessibilityWindowInfo>& windowInfo);
void SetMaxAppWindowNumber(int windowNum);
WMError GetModeChangeHotZones(DisplayId displayId,
ModeChangeHotZones& hotZones, const ModeChangeHotZonesConfig& config);
wmserver/src/accessibility_connection.cpp
+132
View File
@@ -0,0 +1,132 @@
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "accessibility_connection.h"
#include "display_manager_service_inner.h"
#include "window_manager.h"
#include "window_manager_agent_controller.h"
#include "window_manager_hilog.h"
namespace OHOS::Rosen {
namespace {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "AccessibilityConnection"};
}
void AccessibilityConnection::NotifyAccessibilityInfo(const sptr<WindowNode>& node, WindowUpdateType type)
{
auto container = windowRoot_->GetOrCreateWindowNodeContainer(node->GetDisplayId());
if (node == nullptr || container == nullptr) {
WLOGFE("window node or container is null");
return;
}
bool focusChange = false;
uint32_t focusWindowId = container->GetFocusWindow();
auto iter = focusedWindowMap_.find(container);
if (iter == focusedWindowMap_.end()) {
focusedWindowMap_.insert(std::make_pair(container, focusWindowId));
if (focusWindowId != INVALID_WINDOW_ID) {
focusChange = true;
}
} else {
if (focusWindowId != iter->second) {
focusChange = true;
iter->second = focusWindowId;
}
}
WLOGFI("notify accessibility window info: [%{public}u %{public}u %{public}d %{public}d]",
node->GetWindowId(), focusWindowId, focusChange, static_cast<int32_t>(type));
// need handle focus change
switch (type) {
case WindowUpdateType::WINDOW_UPDATE_ADDED:
if (node->currentVisibility_) {
NotifyAccessibilityWindowInfo(container, node, type);
}
break;
case WindowUpdateType::WINDOW_UPDATE_REMOVED:
NotifyAccessibilityWindowInfo(container, node, type);
break;
case WindowUpdateType::WINDOW_UPDATE_PROPERTY:
NotifyAccessibilityWindowInfo(container, node, type);
break;
default:
break;
}
if (focusChange) {
auto focusWindowNode = windowRoot_->GetWindowNode(focusWindowId);
if (focusWindowNode == nullptr) {
WLOGFE("could not find window");
return;
}
NotifyAccessibilityWindowInfo(container, focusWindowNode, WindowUpdateType::WINDOW_UPDATE_FOCUSED);
}
}
void AccessibilityConnection::NotifyAccessibilityWindowInfo(const sptr<WindowNodeContainer>& container,
const sptr<WindowNode>& node, WindowUpdateType type) const
{
sptr<WindowInfo> windowInfo = new (std::nothrow) WindowInfo();
sptr<AccessibilityWindowInfo> accessibilityWindowInfo = new (std::nothrow) AccessibilityWindowInfo();
if (windowInfo != nullptr && accessibilityWindowInfo != nullptr) {
FillWindowInfo(node, container->GetFocusWindow(), windowInfo);
accessibilityWindowInfo->currentWindowInfo_ = windowInfo;
GetWindowList(container, accessibilityWindowInfo->windowList_);
WindowManagerAgentController::GetInstance().NotifyAccessibilityWindowInfo(accessibilityWindowInfo, type);
}
}
void AccessibilityConnection::GetWindowList(const sptr<WindowNodeContainer>& container,
std::vector<sptr<WindowInfo>>& windowList) const
{
std::vector<sptr<WindowNode>> nodes;
container->TraverseContainer(nodes);
for (auto& node : nodes) {
sptr<WindowInfo> windowInfo = new (std::nothrow) WindowInfo();
if (windowInfo != nullptr) {
FillWindowInfo(node, container->GetFocusWindow(), windowInfo);
windowList.emplace_back(windowInfo);
}
}
}
void AccessibilityConnection::FillWindowInfo(const sptr<WindowNode>& node, uint32_t focusedWindow,
sptr<WindowInfo>& windowInfo) const
{
windowInfo->wid_ = static_cast<int32_t>(node->GetWindowId());
windowInfo->windowRect_ = node->GetWindowRect();
windowInfo->focused_ = node->GetWindowId() == focusedWindow;
windowInfo->displayId_ = node->GetDisplayId();
windowInfo->mode_ = node->GetWindowMode();
windowInfo->type_ = node->GetWindowType();
auto property = node->GetWindowProperty();
if (property != nullptr) {
windowInfo->isDecorEnable_ = property->GetDecorEnable();
}
}
void AccessibilityConnection::GetAccessibilityWindowInfo(sptr<AccessibilityWindowInfo>& windowInfo) const
{
std::map<ScreenId, sptr<WindowNodeContainer>> windowNodeContainers;
std::vector<DisplayId> displayIds = DisplayManagerServiceInner::GetInstance().GetAllDisplayIds();
for (DisplayId displayId : displayIds) {
ScreenId screenGroupId = DisplayManagerServiceInner::GetInstance().GetScreenGroupIdByDisplayId(displayId);
auto container = windowRoot_->GetOrCreateWindowNodeContainer(displayId);
if (windowNodeContainers.count(screenGroupId) == 0 && container != nullptr) {
windowNodeContainers.insert(std::make_pair(screenGroupId, container));
GetWindowList(container, windowInfo->windowList_);
}
}
}
}
wmserver/src/window_controller.cpp
+21 -16
View File
@@ -240,6 +240,7 @@ WMError WindowController::AddWindowNode(sptr<WindowProperty>& property)
windowRoot_->FocusFaultDetection();
FlushWindowInfo(property->GetWindowId());
HandleTurnScreenOn(node);
accessibilityConnection_->NotifyAccessibilityInfo(node, WindowUpdateType::WINDOW_UPDATE_ADDED);
if (node->GetWindowType() == WindowType::WINDOW_TYPE_STATUS_BAR ||
node->GetWindowType() == WindowType::WINDOW_TYPE_NAVIGATION_BAR) {
@@ -348,7 +349,12 @@ void WindowController::HandleTurnScreenOn(const sptr<WindowNode>& node)
WMError WindowController::RemoveWindowNode(uint32_t windowId)
{
auto removeFunc = [this, windowId]() {
auto windowNode = windowRoot_->GetWindowNode(windowId);
if (windowNode == nullptr) {
WLOGFE("windowNode is nullptr");
return WMError::WM_ERROR_NULLPTR;
}
auto removeFunc = [this, windowId, windowNode]() {
WMError res = windowRoot_->RemoveWindowNode(windowId);
if (res != WMError::WM_OK) {
WLOGFE("RemoveWindowNode failed");
@@ -356,13 +362,9 @@ WMError WindowController::RemoveWindowNode(uint32_t windowId)
}
windowRoot_->FocusFaultDetection();
FlushWindowInfo(windowId);
accessibilityConnection_->NotifyAccessibilityInfo(windowNode, WindowUpdateType::WINDOW_UPDATE_REMOVED);
return res;
};
auto windowNode = windowRoot_->GetWindowNode(windowId);
if (windowNode == nullptr) {
WLOGFE("windowNode is nullptr");
return WMError::WM_ERROR_NULLPTR;
}
WMError res = WMError::WM_ERROR_NO_REMOTE_ANIMATION;
if (windowNode->GetWindowType() == WindowType::WINDOW_TYPE_KEYGUARD) {
if (RemoteAnimation::NotifyAnimationScreenUnlock(removeFunc) == WMError::WM_OK) {
@@ -392,6 +394,7 @@ WMError WindowController::DestroyWindow(uint32_t windowId, bool onlySelf)
}
windowRoot_->FocusFaultDetection();
FlushWindowInfoWithDisplayId(displayId);
accessibilityConnection_->NotifyAccessibilityInfo(node, WindowUpdateType::WINDOW_UPDATE_REMOVED);
return res;
}
@@ -441,7 +444,10 @@ WMError WindowController::RequestFocus(uint32_t windowId)
if (windowRoot_ == nullptr) {
return WMError::WM_ERROR_NULLPTR;
}
return windowRoot_->RequestFocus(windowId);
WMError res = windowRoot_->RequestFocus(windowId);
accessibilityConnection_->NotifyAccessibilityInfo(windowRoot_->GetWindowNode(windowId),
WindowUpdateType::WINDOW_UPDATE_FOCUSED);
return res;
}
WMError WindowController::SetWindowMode(uint32_t windowId, WindowMode dstMode)
@@ -688,6 +694,8 @@ WMError WindowController::ProcessPointDown(uint32_t windowId, bool isStartDrag)
windowRoot_->RequestActiveWindow(windowId);
if (zOrderRes == WMError::WM_OK || focusRes == WMError::WM_OK) {
FlushWindowInfo(windowId);
accessibilityConnection_->NotifyAccessibilityInfo(windowRoot_->GetWindowNode(windowId),
WindowUpdateType::WINDOW_UPDATE_FOCUSED);
WLOGFI("ProcessPointDown end");
return WMError::WM_OK;
}
@@ -896,7 +904,8 @@ WMError WindowController::UpdateProperty(sptr<WindowProperty>& property, Propert
case PropertyChangeAction::ACTION_UPDATE_TOUCH_HOT_AREA: {
std::vector<Rect> rects;
property->GetTouchHotAreas(rects);
return UpdateTouchHotAreas(node, rects);
UpdateTouchHotAreas(node, rects);
break;
}
case PropertyChangeAction::ACTION_UPDATE_ANIMATION_FLAG: {
node->GetWindowProperty()->SetAnimationFlag(property->GetAnimationFlag());
@@ -912,19 +921,15 @@ WMError WindowController::UpdateProperty(sptr<WindowProperty>& property, Propert
break;
}
if (ret == WMError::WM_OK) {
NotifyWindowPropertyChanged(node);
accessibilityConnection_->NotifyAccessibilityInfo(node, WindowUpdateType::WINDOW_UPDATE_PROPERTY);
}
return ret;
}
void WindowController::NotifyWindowPropertyChanged(const sptr<WindowNode>& node)
WMError WindowController::GetAccessibilityWindowInfo(sptr<AccessibilityWindowInfo>& windowInfo) const
{
auto windowNodeContainer = windowRoot_->GetOrCreateWindowNodeContainer(node->GetDisplayId());
if (windowNodeContainer == nullptr) {
WLOGFE("windowNodeContainer is null");
return;
}
windowNodeContainer->NotifyAccessibilityWindowInfo(node, WindowUpdateType::WINDOW_UPDATE_PROPERTY);
accessibilityConnection_->GetAccessibilityWindowInfo(windowInfo);
return WMError::WM_OK;
}
WMError WindowController::GetModeChangeHotZones(DisplayId displayId,
wmserver/src/window_manager_service.cpp
+1 -1
View File
@@ -659,7 +659,7 @@ WMError WindowManagerService::GetAccessibilityWindowInfo(sptr<AccessibilityWindo
return WMError::WM_ERROR_NULLPTR;
}
return PostSyncTask([this, &windowInfo]() {
return windowRoot_->GetAccessibilityWindowInfo(windowInfo);
return windowController_->GetAccessibilityWindowInfo(windowInfo);
});
}
wmserver/src/window_node_container.cpp
-76
View File
@@ -182,7 +182,6 @@ WMError WindowNodeContainer::AddWindowNode(sptr<WindowNode>& node, sptr<WindowNo
layoutPolicy_->AddWindowNode(node);
NotifyIfAvoidAreaChanged(node, AvoidControlType::AVOID_NODE_ADD);
DumpScreenWindowTree();
NotifyAccessibilityWindowInfo(node, WindowUpdateType::WINDOW_UPDATE_ADDED);
UpdateCameraFloatWindowStatus(node, true);
if (WindowHelper::IsAppWindow(node->GetWindowType())) {
backupWindowIds_.clear();
@@ -295,7 +294,6 @@ WMError WindowNodeContainer::RemoveWindowNode(sptr<WindowNode>& node)
}
NotifyIfAvoidAreaChanged(node, AvoidControlType::AVOID_NODE_REMOVE);
DumpScreenWindowTree();
NotifyAccessibilityWindowInfo(node, WindowUpdateType::WINDOW_UPDATE_REMOVED);
RecoverScreenDefaultOrientationIfNeed(node->GetDisplayId());
UpdateCameraFloatWindowStatus(node, false);
if (node->GetWindowType() == WindowType::WINDOW_TYPE_KEYGUARD) {
@@ -612,8 +610,6 @@ WMError WindowNodeContainer::SetFocusWindow(uint32_t windowId)
}
UpdateFocusStatus(focusedWindow_, false);
focusedWindow_ = windowId;
sptr<WindowNode> node = FindWindowNodeById(windowId);
NotifyAccessibilityWindowInfo(node, WindowUpdateType::WINDOW_UPDATE_FOCUSED);
UpdateFocusStatus(focusedWindow_, true);
return WMError::WM_OK;
}
@@ -1004,78 +1000,6 @@ void WindowNodeContainer::RaiseWindowToTop(uint32_t windowId, std::vector<sptr<W
}
}
void WindowNodeContainer::FillWindowInfo(sptr<WindowInfo>& windowInfo, const sptr<WindowNode>& node) const
{
if (windowInfo == nullptr) {
WLOGFE("windowInfo is null");
return;
}
windowInfo->wid_ = static_cast<int32_t>(node->GetWindowId());
windowInfo->windowRect_ = node->GetWindowRect();
windowInfo->focused_ = node->GetWindowId() == focusedWindow_;
windowInfo->displayId_ = node->GetDisplayId();
windowInfo->mode_ = node->GetWindowMode();
windowInfo->type_ = node->GetWindowType();
auto property = node->GetWindowProperty();
if (property != nullptr) {
windowInfo->isDecorEnable_ = property->GetDecorEnable();
}
}
void WindowNodeContainer::NotifyAccessibilityWindowInfo(const sptr<WindowNode>& node, WindowUpdateType type) const
{
if (node == nullptr) {
WLOGFE("window node is null");
return;
}
bool isNeedNotify = false;
switch (type) {
case WindowUpdateType::WINDOW_UPDATE_ADDED:
if (node->currentVisibility_) {
isNeedNotify = true;
}
break;
case WindowUpdateType::WINDOW_UPDATE_FOCUSED:
if (node->GetWindowId() == focusedWindow_) {
isNeedNotify = true;
}
break;
case WindowUpdateType::WINDOW_UPDATE_REMOVED:
isNeedNotify = true;
break;
case WindowUpdateType::WINDOW_UPDATE_PROPERTY:
isNeedNotify = true;
break;
default:
break;
}
if (isNeedNotify) {
std::vector<sptr<WindowInfo>> windowList;
GetWindowList(windowList);
sptr<WindowInfo> windowInfo = new (std::nothrow) WindowInfo();
sptr<AccessibilityWindowInfo> accessibilityWindowInfo = new (std::nothrow) AccessibilityWindowInfo();
if (windowInfo != nullptr && accessibilityWindowInfo != nullptr) {
FillWindowInfo(windowInfo, node);
accessibilityWindowInfo->currentWindowInfo_ = windowInfo;
accessibilityWindowInfo->windowList_ = windowList;
WindowManagerAgentController::GetInstance().NotifyAccessibilityWindowInfo(accessibilityWindowInfo, type);
}
}
}
void WindowNodeContainer::GetWindowList(std::vector<sptr<WindowInfo>>& windowList) const
{
std::vector<sptr<WindowNode>> windowNodes;
TraverseContainer(windowNodes);
for (auto node : windowNodes) {
sptr<WindowInfo> windowInfo = new (std::nothrow) WindowInfo();
if (windowInfo != nullptr) {
FillWindowInfo(windowInfo, node);
windowList.emplace_back(windowInfo);
}
}
}
void WindowNodeContainer::TraverseContainer(std::vector<sptr<WindowNode>>& windowNodes) const
{
for (auto& node : belowAppWindowNode_->children_) {
wmserver/src/window_root.cpp
+1 -14
View File
@@ -420,7 +420,7 @@ WMError WindowRoot::PostProcessAddWindowNode(sptr<WindowNode>& node, sptr<Window
sptr<WindowNodeContainer>& container)
{
if (!node->currentVisibility_) {
WLOGFI("window is isVisible, do not need process");
WLOGFI("window is invisible, do not need process");
return WMError::WM_DO_NOTHING;
}
if (WindowHelper::IsSubWindow(node->GetWindowType())) {
@@ -1277,19 +1277,6 @@ Rect WindowRoot::GetDisplayGroupRect(DisplayId displayId) const
return container->GetDisplayGroupRect();
}
WMError WindowRoot::GetAccessibilityWindowInfo(sptr<AccessibilityWindowInfo>& windowInfo)
{
for (auto& iter : windowNodeContainerMap_) {
auto container = iter.second;
std::vector<sptr<WindowInfo>> windowList;
container->GetWindowList(windowList);
for (auto window : windowList) {
windowInfo->windowList_.emplace_back(window);
}
}
return WMError::WM_OK;
}
void WindowRoot::SetMaxAppWindowNumber(int windowNum)
{
maxAppWindowNumber_ = windowNum;