Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
ec611470
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
ec611470
编写于
4月 23, 2018
作者:
Y
Yegor
提交者:
GitHub
4月 23, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
replace nextNodeId/previousNodeId with hitTestPosition (#5066)
上级
2970c099
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
11 addition
and
22 deletion
+11
-22
lib/ui/semantics.dart
lib/ui/semantics.dart
+3
-6
lib/ui/semantics/semantics_node.h
lib/ui/semantics/semantics_node.h
+1
-2
lib/ui/semantics/semantics_update_builder.cc
lib/ui/semantics/semantics_update_builder.cc
+2
-4
lib/ui/semantics/semantics_update_builder.h
lib/ui/semantics/semantics_update_builder.h
+1
-2
shell/platform/android/io/flutter/view/AccessibilityBridge.java
...platform/android/io/flutter/view/AccessibilityBridge.java
+3
-7
shell/platform/android/platform_view_android.cc
shell/platform/android/platform_view_android.cc
+1
-1
未找到文件。
lib/ui/semantics.dart
浏览文件 @
ec611470
...
...
@@ -488,8 +488,7 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass2 {
String
increasedValue
,
String
decreasedValue
,
TextDirection
textDirection
,
int
nextNodeId
,
int
previousNodeId
,
int
hitTestPosition
,
Float64List
transform
,
Int32List
children
,
})
{
...
...
@@ -513,8 +512,7 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass2 {
increasedValue
,
decreasedValue
,
textDirection
!=
null
?
textDirection
.
index
+
1
:
0
,
nextNodeId
??
-
1
,
previousNodeId
??
-
1
,
hitTestPosition
,
transform
,
children
,);
}
...
...
@@ -537,8 +535,7 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass2 {
String
increasedValue
,
String
decreasedValue
,
int
textDirection
,
int
nextNodeId
,
int
previousNodeId
,
int
hitTestPosition
,
Float64List
transform
,
Int32List
children
,
)
native
'SemanticsUpdateBuilder_updateNode'
;
...
...
lib/ui/semantics/semantics_node.h
浏览文件 @
ec611470
...
...
@@ -82,8 +82,7 @@ struct SemanticsNode {
std
::
string
increasedValue
;
std
::
string
decreasedValue
;
int32_t
textDirection
=
0
;
// 0=unknown, 1=rtl, 2=ltr
int32_t
nextNodeId
=
-
1
;
int32_t
previousNodeId
=
-
1
;
int32_t
hitTestPosition
=
-
1
;
SkRect
rect
=
SkRect
::
MakeEmpty
();
SkMatrix44
transform
=
SkMatrix44
(
SkMatrix44
::
kIdentity_Constructor
);
...
...
lib/ui/semantics/semantics_update_builder.cc
浏览文件 @
ec611470
...
...
@@ -52,8 +52,7 @@ void SemanticsUpdateBuilder::updateNode(int id,
std
::
string
increasedValue
,
std
::
string
decreasedValue
,
int
textDirection
,
int
nextNodeId
,
int
previousNodeId
,
int
hitTestPosition
,
const
tonic
::
Float64List
&
transform
,
const
tonic
::
Int32List
&
children
)
{
SemanticsNode
node
;
...
...
@@ -72,8 +71,7 @@ void SemanticsUpdateBuilder::updateNode(int id,
node
.
increasedValue
=
increasedValue
;
node
.
decreasedValue
=
decreasedValue
;
node
.
textDirection
=
textDirection
;
node
.
nextNodeId
=
nextNodeId
;
node
.
previousNodeId
=
previousNodeId
;
node
.
hitTestPosition
=
hitTestPosition
;
node
.
transform
.
setColMajord
(
transform
.
data
());
node
.
children
=
std
::
vector
<
int32_t
>
(
children
.
data
(),
children
.
data
()
+
children
.
num_elements
());
...
...
lib/ui/semantics/semantics_update_builder.h
浏览文件 @
ec611470
...
...
@@ -43,8 +43,7 @@ class SemanticsUpdateBuilder
std
::
string
increasedValue
,
std
::
string
decreasedValue
,
int
textDirection
,
int
nextNodeId
,
int
previousNodeId
,
int
hitTestPosition
,
const
tonic
::
Float64List
&
transform
,
const
tonic
::
Int32List
&
children
);
...
...
shell/platform/android/io/flutter/view/AccessibilityBridge.java
浏览文件 @
ec611470
...
...
@@ -251,10 +251,6 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements BasicMess
result
.
setSelected
(
object
.
hasFlag
(
Flag
.
IS_SELECTED
));
result
.
setText
(
object
.
getValueLabelHint
());
if
(
object
.
previousNodeId
!=
-
1
&&
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
LOLLIPOP_MR1
)
{
result
.
setTraversalAfter
(
mOwner
,
object
.
previousNodeId
);
}
// Accessibility Focus
if
(
mA11yFocusedObject
!=
null
&&
mA11yFocusedObject
.
id
==
virtualViewId
)
{
...
...
@@ -744,7 +740,7 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements BasicMess
String
decreasedValue
;
String
hint
;
TextDirection
textDirection
;
int
previousNodeId
;
int
hitTestPosition
;
boolean
hadPreviousConfig
=
false
;
int
previousFlags
;
...
...
@@ -797,7 +793,7 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements BasicMess
void
log
(
String
indent
,
boolean
recursive
)
{
Log
.
i
(
TAG
,
indent
+
"SemanticsObject id="
+
id
+
" label="
+
label
+
" actions="
+
actions
+
" flags="
+
flags
+
"\n"
+
indent
+
" +-- textDirection="
+
textDirection
+
"\n"
+
indent
+
" +--
previousNodeId="
+
previousNodeId
+
"\n"
+
indent
+
" +--
hitTestPosition="
+
hitTestPosition
+
"\n"
+
indent
+
" +-- rect.ltrb=("
+
left
+
", "
+
top
+
", "
+
right
+
", "
+
bottom
+
")\n"
+
indent
+
" +-- transform="
+
Arrays
.
toString
(
transform
)
+
"\n"
);
if
(
children
!=
null
&&
recursive
)
{
...
...
@@ -844,7 +840,7 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements BasicMess
textDirection
=
TextDirection
.
fromInt
(
buffer
.
getInt
());
previousNodeId
=
buffer
.
getInt
();
hitTestPosition
=
buffer
.
getInt
();
left
=
buffer
.
getFloat
();
top
=
buffer
.
getFloat
();
...
...
shell/platform/android/platform_view_android.cc
浏览文件 @
ec611470
...
...
@@ -243,7 +243,7 @@ void PlatformViewAndroid::UpdateSemantics(blink::SemanticsNodeUpdates update) {
strings
.
push_back
(
node
.
hint
);
}
buffer_int32
[
position
++
]
=
node
.
textDirection
;
buffer_int32
[
position
++
]
=
node
.
previousNodeId
;
buffer_int32
[
position
++
]
=
node
.
hitTestPosition
;
buffer_float32
[
position
++
]
=
node
.
rect
.
left
();
buffer_float32
[
position
++
]
=
node
.
rect
.
top
();
buffer_float32
[
position
++
]
=
node
.
rect
.
right
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录