Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lindexi_gd
Uno
提交
f5d1a2e6
U
Uno
项目概览
lindexi_gd
/
Uno
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
Uno
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f5d1a2e6
编写于
4月 26, 2023
作者:
D
David
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(reg): Android, do not clear pointer state if view is going to be re-used in same layouting pass
上级
12175afb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
5 deletion
+30
-5
src/Uno.UI/UI/Xaml/Controls/ListViewBase/NativeListViewBase.Android.cs
.../Xaml/Controls/ListViewBase/NativeListViewBase.Android.cs
+26
-5
src/Uno.UI/UI/Xaml/Controls/ListViewBase/VirtualizingPanelLayout.Android.cs
.../Controls/ListViewBase/VirtualizingPanelLayout.Android.cs
+4
-0
未找到文件。
src/Uno.UI/UI/Xaml/Controls/ListViewBase/NativeListViewBase.Android.cs
浏览文件 @
f5d1a2e6
...
...
@@ -238,12 +238,32 @@ namespace Windows.UI.Xaml.Controls
return
NativeLayout
.
CanCurrentlyScrollVertically
(
direction
);
}
private
bool
_trackDetachedViews
;
private
readonly
List
<
UnoViewHolder
>
_detachedViews
=
new
();
internal
void
StartDetachedViewTracking
()
=>
_trackDetachedViews
=
true
;
internal
void
StopDetachedViewTrackingAndNotifyPendingAsRecycled
()
{
_trackDetachedViews
=
false
;
// This should be invoked only from the LV.CleanContainer()
// **BUT** the container is not Cleaned/Prepared by the LV on Android
// https://github.com/unoplatform/uno/issues/11957
foreach
(
var
detachedView
in
_detachedViews
)
{
UIElement
.
PrepareForRecycle
(
detachedView
.
ItemView
);
}
}
protected
override
void
AttachViewToParent
(
View
child
,
int
index
,
ViewGroup
.
LayoutParams
layoutParams
)
{
var
vh
=
GetChildViewHolder
(
child
);
if
(
vh
!=
null
)
{
vh
.
IsDetached
=
false
;
_detachedViews
.
Remove
(
vh
);
}
base
.
AttachViewToParent
(
child
,
index
,
layoutParams
);
}
...
...
@@ -257,11 +277,11 @@ namespace Windows.UI.Xaml.Controls
if
(
vh
!=
null
)
{
vh
.
IsDetached
=
true
;
// This should be invoked only from the LV.CleanContainer()
// **BUT** the container is not Cleaned/Prepared by the LV on Androi
d
// https://github.com/unoplatform/uno/issues/11957
UIElement
.
PrepareForRecycle
(
view
);
if
(
_trackDetachedViews
)
{
// Avoid memory leak by adding them only when neede
d
_detachedViews
.
Add
(
vh
);
}
}
}
base
.
DetachViewFromParent
(
index
);
...
...
@@ -273,6 +293,7 @@ namespace Windows.UI.Xaml.Controls
if
(
vh
!=
null
)
{
vh
.
IsDetached
=
false
;
_detachedViews
.
Remove
(
vh
);
}
#if DEBUG
if
(!
vh
.
IsDetachedPrivate
)
...
...
src/Uno.UI/UI/Xaml/Controls/ListViewBase/VirtualizingPanelLayout.Android.cs
浏览文件 @
f5d1a2e6
...
...
@@ -1252,6 +1252,8 @@ namespace Windows.UI.Xaml.Controls
return
;
}
XamlParent
?.
NativePanel
.
StartDetachedViewTracking
();
var
needsScrapOnMeasure
=
isMeasure
&&
availableExtent
>
0
&&
availableBreadth
>
0
&&
ChildCount
>
0
;
var
updatedAfterCollectionChange
=
false
;
if
(
_isRecycleLayoutRequested
)
...
...
@@ -1302,6 +1304,8 @@ namespace Windows.UI.Xaml.Controls
AssertValidState
();
}
XamlParent
?.
NativePanel
.
StopDetachedViewTrackingAndNotifyPendingAsRecycled
();
if
(!
isMeasure
)
{
// Update HorizontalScrollRange and VerticalScrollRange because they're used by the ScrollViewer to get ExtentWidth and ExtentHeight.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录