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

change recent hot zone & inputmethod unfocusable

Browse Source 
Signed-off-by: qianlf <qianliangfang@huawei.com>
Change-Id: Ibafd8441d0ae89f662be4d0cec653ff535819a07
This commit is contained in:
qianlf
2022-03-14 17:13:21 +08:00
parent 5559b4f029
commit 3655af0469
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/innerkits/wm/window_life_cycle_interface.h
-2
View File
@@ -25,8 +25,6 @@ public:
virtual void AfterForeground() = 0;
virtual void AfterBackground() = 0;
virtual void AfterFocused() = 0;
// TODO: need rename AfterUnFocused to AfterUnfocused
virtual void AfterUnFocused() {}
virtual void AfterUnfocused() {}
};
}
wm/include/window_impl.h
+8
View File
@@ -162,6 +162,14 @@ private:
{
CALL_LIFECYCLE_LISTENER(AfterUnfocused, UnFocus);
}
inline void NotifyListenerAfterUnfocused() const
{
for (auto& listener : lifecycleListeners_) {
if (listener != nullptr) {
listener->AfterUnfocused();
}
}
}
inline void NotifyBeforeDestroy(std::string windowName) const
{
if (uiContent_ != nullptr) {
wm/src/window_impl.cpp
+12
View File
@@ -1215,6 +1215,17 @@ void WindowImpl::ConsumePointerEvent(std::shared_ptr<MMI::PointerEvent>& pointer
int32_t action = pointerEvent->GetPointerAction();
if (action == MMI::PointerEvent::POINTER_ACTION_DOWN || action == MMI::PointerEvent::POINTER_ACTION_BUTTON_DOWN) {
WLOGI("WMS process point down, windowId: %{public}u, action: %{public}d", GetWindowId(), action);
if (GetType() == WindowType::WINDOW_TYPE_LAUNCHER_RECENT) {
MMI::PointerEvent::PointerItem pointerItem;
if (!pointerEvent->GetPointerItem(pointerEvent->GetPointerId(), pointerItem)) {
WLOGFW("Point item is invalid");
return;
}
if (!WindowHelper::IsPointInTargetRect(pointerItem.GetGlobalX(), pointerItem.GetGlobalY(), GetRect())) {
NotifyListenerAfterUnfocused();
return;
}
}
SingletonContainer::Get<WindowAdapter>().ProcessWindowTouchedEvent(property_->GetWindowId());
}
if (WindowHelper::IsMainFloatingWindow(GetType(), GetMode()) ||
@@ -1395,6 +1406,7 @@ void WindowImpl::SetDefaultOption()
}
case WindowType::WINDOW_TYPE_INPUT_METHOD_FLOAT: {
property_->SetWindowMode(WindowMode::WINDOW_MODE_FLOATING);
property_->SetFocusable(false);
break;
}
case WindowType::WINDOW_TYPE_BOOT_ANIMATION:
wmserver/src/window_layout_policy.cpp
+2
View File
@@ -250,6 +250,8 @@ void WindowLayoutPolicy::CalcAndSetNodeHotZone(Rect layoutOutRect, sptr<WindowNo
rect.posY_ -= hotZone;
rect.height_ += (hotZone + hotZone);
}
} else if (node->GetWindowType() == WindowType::WINDOW_TYPE_LAUNCHER_RECENT) {
rect = displayRect_;
} else if (WindowHelper::IsMainFloatingWindow(node->GetWindowType(), node->GetWindowMode())) {
rect.posX_ -= hotZone;
rect.posY_ -= hotZone;