Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
d12f2a60
E
engine
项目概览
weixin_43355755
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
d12f2a60
编写于
1月 08, 2020
作者:
B
brandondiamond
提交者:
Chris Bracken
1月 08, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add support for on/off switch labels when built on iOS 13. (#12467)
上级
5c9e134b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
0 deletion
+29
-0
lib/ui/window.dart
lib/ui/window.dart
+8
-0
lib/ui/window/window.h
lib/ui/window/window.h
+1
-0
lib/web_ui/lib/src/ui/window.dart
lib/web_ui/lib/src/ui/window.dart
+9
-0
shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
...form/darwin/ios/framework/Source/FlutterViewController.mm
+11
-0
未找到文件。
lib/ui/window.dart
浏览文件 @
d12f2a60
...
...
@@ -1213,6 +1213,7 @@ class AccessibilityFeatures {
static
const
int
_kDisableAnimationsIndex
=
1
<<
2
;
static
const
int
_kBoldTextIndex
=
1
<<
3
;
static
const
int
_kReduceMotionIndex
=
1
<<
4
;
static
const
int
_kOnOffSwitchLabelsIndex
=
1
<<
5
;
// A bitfield which represents each enabled feature.
final
int
_index
;
...
...
@@ -1240,6 +1241,11 @@ class AccessibilityFeatures {
/// Only supported on iOS.
bool
get
reduceMotion
=>
_kReduceMotionIndex
&
_index
!=
0
;
/// The platform is requesting that on/off labels be added to switches.
///
/// Only supported on iOS.
bool
get
onOffSwitchLabels
=>
_kOnOffSwitchLabelsIndex
&
_index
!=
0
;
@override
String
toString
()
{
final
List
<
String
>
features
=
<
String
>[];
...
...
@@ -1253,6 +1259,8 @@ class AccessibilityFeatures {
features
.
add
(
'boldText'
);
if
(
reduceMotion
)
features
.
add
(
'reduceMotion'
);
if
(
onOffSwitchLabels
)
features
.
add
(
'onOffSwitchLabels'
);
return
'AccessibilityFeatures
$features
'
;
}
...
...
lib/ui/window/window.h
浏览文件 @
d12f2a60
...
...
@@ -44,6 +44,7 @@ enum class AccessibilityFeatureFlag : int32_t {
kDisableAnimations
=
1
<<
2
,
kBoldText
=
1
<<
3
,
kReduceMotion
=
1
<<
4
,
kOnOffSwitchLabels
=
1
<<
5
,
};
class
WindowClient
{
...
...
lib/web_ui/lib/src/ui/window.dart
浏览文件 @
d12f2a60
...
...
@@ -995,6 +995,7 @@ class AccessibilityFeatures {
static
const
int
_kDisableAnimationsIndex
=
1
<<
2
;
static
const
int
_kBoldTextIndex
=
1
<<
3
;
static
const
int
_kReduceMotionIndex
=
1
<<
4
;
static
const
int
_kOnOffSwitchLabelsIndex
=
1
<<
5
;
// A bitfield which represents each enabled feature.
final
int
_index
;
...
...
@@ -1022,6 +1023,11 @@ class AccessibilityFeatures {
/// Only supported on iOS.
bool
get
reduceMotion
=>
_kReduceMotionIndex
&
_index
!=
0
;
/// The platform is requesting that on/off labels be added to switches.
///
/// Only supported on iOS.
bool
get
onOffSwitchLabels
=>
_kOnOffSwitchLabelsIndex
&
_index
!=
0
;
@override
String
toString
()
{
final
List
<
String
>
features
=
<
String
>[];
...
...
@@ -1040,6 +1046,9 @@ class AccessibilityFeatures {
if
(
reduceMotion
)
{
features
.
add
(
'reduceMotion'
);
}
if
(
onOffSwitchLabels
)
{
features
.
add
(
'onOffSwitchLabels'
);
}
return
'AccessibilityFeatures
$features
'
;
}
...
...
shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
浏览文件 @
d12f2a60
...
...
@@ -238,6 +238,13 @@ typedef enum UIAccessibilityContrast : NSInteger {
selector:
@selector
(
onUserSettingsChanged
:)
name:
UIContentSizeCategoryDidChangeNotification
object:
nil
];
if
(
@available
(
iOS
13
,
*
))
{
[
center
addObserver
:
self
selector:
@selector
(
onAccessibilityStatusChanged
:)
name:
UIAccessibilityOnOffSwitchLabelsDidChangeNotification
object:
nil
];
}
}
-
(
void
)
setInitialRoute
:(
NSString
*
)
route
{
...
...
@@ -889,6 +896,10 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
flags
|=
static_cast
<
int32_t
>
(
flutter
::
AccessibilityFeatureFlag
::
kReduceMotion
);
if
(
UIAccessibilityIsBoldTextEnabled
())
flags
|=
static_cast
<
int32_t
>
(
flutter
::
AccessibilityFeatureFlag
::
kBoldText
);
if
(
@available
(
iOS
13
,
*
))
{
if
(
UIAccessibilityIsOnOffSwitchLabelsEnabled
())
flags
|=
static_cast
<
int32_t
>
(
flutter
::
AccessibilityFeatureFlag
::
kOnOffSwitchLabels
);
}
#if TARGET_OS_SIMULATOR
// There doesn't appear to be any way to determine whether the accessibility
// inspector is enabled on the simulator. We conservatively always turn on the
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录