openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-23 07:01:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

标题栏手势

Browse Source 
Signed-off-by: yihao lin <linyihao4@huawei.com>
This commit is contained in:
yihao lin 2024-11-22 14:31:56 +08:00
parent 7f49d50a00
commit 723b587296
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
frameworks/core/components_ng/pattern/container_modal/enhance/container_modal_pattern_enhance.cpp
View File

@ -150,6 +150,14 @@ RefPtr<FrameNode> BuildMenuItem(WeakPtr<ContainerModalPatternEnhance>&& weakPatt
BondingMenuItemEvent(weakPattern, containerTitleRow, isLeftSplit);
return containerTitleRow;
}
void EventHubOnModifyDone(RefPtr<FrameNode>& node)
{
CHECK_NULL_VOID(node);
auto eventHub = node->GetOrCreateGestureEventHub();
CHECK_NULL_VOID(eventHub);
eventHub->OnModifyDone();
}
} // namespace
void ContainerModalPatternEnhance::ShowTitle(bool isShow, bool hasDeco, bool needUpdate)
@ -226,16 +234,16 @@ void ContainerModalPatternEnhance::ShowTitle(bool isShow, bool hasDeco, bool nee
CHECK_NULL_VOID(gestureRow);
// add tap event and pan event
auto pattern = containerNode->GetPattern<ContainerModalPatternEnhance>();
pattern->SetTapGestureEvent(customTitleRow);
pattern->SetTapGestureEvent(gestureRow);
AddPanEvent(customTitleRow);
AddPanEvent(gestureRow);
auto customTitleRowEventHub = customTitleRow->GetOrCreateGestureEventHub();
customTitleRowEventHub->OnModifyDone();
auto gestureRowEventHub = gestureRow->GetOrCreateGestureEventHub();
gestureRowEventHub->OnModifyDone();
if (enableContainerModalGesture_) {
auto pattern = containerNode->GetPattern<ContainerModalPatternEnhance>();
pattern->SetTapGestureEvent(customTitleRow);
pattern->SetTapGestureEvent(gestureRow);
AddPanEvent(customTitleRow);
AddPanEvent(gestureRow);
EventHubOnModifyDone(customTitleRow);
EventHubOnModifyDone(gestureRow);
}
UpdateGestureRowVisible();
InitColumnTouchTestFunc();
controlButtonsNode->SetHitTestMode(HitTestMode::HTMTRANSPARENT_SELF);
@ -677,6 +685,8 @@ void ContainerModalPatternEnhance::EnableContainerModalGesture(bool isEnable)
{
TAG_LOGI(AceLogTag::ACE_APPBAR, "set event on container modal is %{public}d", isEnable);
enableContainerModalGesture_ = isEnable;
auto floatingTitleRow = GetFloatingTitleRow();
auto customTitleRow = GetCustomTitleRow();
auto gestureRow = GetGestureRow();
@ -685,6 +695,9 @@ void ContainerModalPatternEnhance::EnableContainerModalGesture(bool isEnable)
EnableTapGestureOnNode(customTitleRow, isEnable, "custom title row");
EnablePanEventOnNode(gestureRow, isEnable, "gesture row");
EnableTapGestureOnNode(gestureRow, isEnable, "gesture row");
EventHubOnModifyDone(floatingTitleRow);
EventHubOnModifyDone(customTitleRow);
EventHubOnModifyDone(gestureRow);
}
bool ContainerModalPatternEnhance::GetFloatingTitleVisible()

1
frameworks/core/components_ng/pattern/container_modal/enhance/container_modal_pattern_enhance.h
View File

@ -108,6 +108,7 @@ private:
bool isForbidMenuEvent_ = false;
bool enableSplit_ = true;
CancelableCallback<void()> contextTimer_;
bool enableContainerModalGesture_ = true;
};
} // namespace OHOS::Ace::NG
#endif // FOUNDATION_ACE_FRAMEWORKS_CORE_COMPONENTS_NG_PATTERNS_CONTAINER_MODAL_CONTAINER_MODAL_PATTERN_ENHANCE_H