Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
e4dffc10
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,发现更多精彩内容 >>
未验证
提交
e4dffc10
编写于
10月 29, 2020
作者:
F
Ferhat
提交者:
GitHub
10月 29, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[web] Fix scroll wheel line delta on Firefox. (#21928)
上级
247139a8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
225 addition
and
2 deletion
+225
-2
e2etests/web/regular_integration_tests/lib/scroll_wheel_main.dart
.../web/regular_integration_tests/lib/scroll_wheel_main.dart
+155
-0
e2etests/web/regular_integration_tests/test_driver/scroll_wheel_integration.dart
...tegration_tests/test_driver/scroll_wheel_integration.dart
+32
-0
e2etests/web/regular_integration_tests/test_driver/scroll_wheel_integration_test.dart
...tion_tests/test_driver/scroll_wheel_integration_test.dart
+11
-0
lib/web_ui/lib/src/engine/pointer_binding.dart
lib/web_ui/lib/src/engine/pointer_binding.dart
+27
-2
未找到文件。
e2etests/web/regular_integration_tests/lib/scroll_wheel_main.dart
0 → 100644
浏览文件 @
e4dffc10
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'dart:html'
as
html
;
import
'dart:js_util'
as
js_util
;
import
'package:flutter/material.dart'
;
void
main
(
)
=>
runApp
(
MyApp
());
class
MyApp
extends
StatelessWidget
{
// This widget is the root of your application.
@override
Widget
build
(
BuildContext
context
)
{
return
MaterialApp
(
title:
'Flutter Scroll Wheel Test'
,
theme:
ThemeData
(
// This is the theme of your application.
//
// Try running your application with "flutter run". You'll see the
// application has a blue toolbar. Then, without quitting the app, try
// changing the primarySwatch below to Colors.green and then invoke
// "hot reload" (press "r" in the console where you ran "flutter run",
// or simply save your changes to "hot reload" in a Flutter IDE).
// Notice that the counter didn't reset back to zero; the application
// is not restarted.
primarySwatch:
Colors
.
blue
,
fontFamily:
'RobotoMono'
,
// This makes the visual density adapt to the platform that you run
// the app on. For desktop platforms, the controls will be smaller and
// closer together (more dense) than on mobile platforms.
visualDensity:
VisualDensity
.
adaptivePlatformDensity
,
),
home:
MyHomePage
(
title:
'Flutter Scroll Wheel Test'
),
);
}
}
class
MyHomePage
extends
StatefulWidget
{
MyHomePage
({
Key
key
,
this
.
title
})
:
super
(
key:
key
);
// This widget is the home page of your application. It is stateful, meaning
// that it has a State object (defined below) that contains fields that affect
// how it looks.
// This class is the configuration for the state. It holds the values (in this
// case the title) provided by the parent (in this case the App widget) and
// used by the build method of the State. Fields in a Widget subclass are
// always marked "final".
final
String
title
;
@override
_MyHomePageState
createState
()
=>
_MyHomePageState
();
}
class
_MyHomePageState
extends
State
<
MyHomePage
>
{
int
_counter
=
0
;
void
_incrementCounter
()
{
setState
(()
{
// This call to setState tells the Flutter framework that something has
// changed in this State, which causes it to rerun the build method below
// so that the display can reflect the updated values. If we changed
// _counter without calling setState(), then the build method would not be
// called again, and so nothing would appear to happen.
_counter
++;
});
}
@override
Widget
build
(
BuildContext
context
)
{
// This method is rerun every time setState is called, for instance as done
// by the _incrementCounter method above.
//
// The Flutter framework has been optimized to make rerunning build methods
// fast, so that you can just rebuild anything that needs updating rather
// than having to individually change instances of widgets.
return
Scaffold
(
appBar:
AppBar
(
// Here we take the value from the MyHomePage object that was created by
// the App.build method, and use it to set our appbar title.
title:
Text
(
widget
.
title
),
),
body:
ListView
.
builder
(
itemCount:
1000
,
itemBuilder:
(
context
,
index
)
=>
Padding
(
padding:
EdgeInsets
.
all
(
20
),
child:
Container
(
height:
100
,
color:
Colors
.
lightBlue
,
child:
Center
(
child:
Text
(
"Item
$index
"
),
),
),
),
),
floatingActionButton:
FloatingActionButton
.
extended
(
key:
const
Key
(
'scroll-button'
),
onPressed:
()
{
final
int
centerX
=
100
;
//html.window.innerWidth ~/ 2;
final
int
centerY
=
100
;
//html.window.innerHeight ~/ 2;
dispatchMouseWheelEvent
(
centerX
,
centerY
,
DeltaMode
.
kLine
,
0
,
1
);
dispatchMouseWheelEvent
(
centerX
,
centerY
,
DeltaMode
.
kLine
,
0
,
1
);
dispatchMouseWheelEvent
(
centerX
,
centerY
,
DeltaMode
.
kLine
,
0
,
1
);
dispatchMouseWheelEvent
(
centerX
,
centerY
,
DeltaMode
.
kLine
,
0
,
1
);
dispatchMouseWheelEvent
(
centerX
,
centerY
,
DeltaMode
.
kLine
,
0
,
1
);
},
label:
Text
(
'Scroll'
),
icon:
Icon
(
Icons
.
thumb_up
),
),
);
}
}
abstract
class
DeltaMode
{
static
const
int
kPixel
=
0x00
;
static
const
int
kLine
=
0x01
;
static
const
int
kPage
=
0x02
;
}
html
.
WheelEvent
dispatchMouseWheelEvent
(
int
mouseX
,
int
mouseY
,
int
deltaMode
,
double
deltaX
,
double
deltaY
,
{
bool
shiftKeyPressed
=
false
})
{
html
.
EventTarget
target
=
html
.
document
.
elementFromPoint
(
mouseX
,
mouseY
);
target
.
dispatchEvent
(
html
.
MouseEvent
(
"mouseover"
,
screenX:
mouseX
,
screenY:
mouseY
,
clientX:
mouseX
,
clientY:
mouseY
,
));
target
.
dispatchEvent
(
html
.
MouseEvent
(
"mousemove"
,
screenX:
mouseX
,
screenY:
mouseY
,
clientX:
mouseX
,
clientY:
mouseY
,
));
html
.
WheelEvent
event
=
html
.
WheelEvent
(
'wheel'
,
screenX:
mouseX
,
screenY:
mouseY
,
clientX:
mouseX
,
clientY:
mouseY
,
deltaMode:
deltaMode
,
deltaX
:
deltaX
,
deltaY
:
deltaY
,
shiftKey:
shiftKeyPressed
,
);
target
.
dispatchEvent
(
event
);
return
event
;
}
e2etests/web/regular_integration_tests/test_driver/scroll_wheel_integration.dart
0 → 100644
浏览文件 @
e4dffc10
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'dart:html'
as
html
;
import
'dart:js_util'
as
js_util
;
import
'package:flutter/material.dart'
;
import
'package:flutter_test/flutter_test.dart'
;
import
'package:regular_integration_tests/scroll_wheel_main.dart'
as
app
;
import
'package:integration_test/integration_test.dart'
;
void
main
(
)
{
final
IntegrationTestWidgetsFlutterBinding
binding
=
IntegrationTestWidgetsFlutterBinding
.
ensureInitialized
()
as
IntegrationTestWidgetsFlutterBinding
;
testWidgets
(
'Test mousewheel scroll by line'
,
(
WidgetTester
tester
)
async
{
app
.
main
();
await
tester
.
pumpAndSettle
();
final
Finder
finder
=
find
.
byKey
(
const
Key
(
'scroll-button'
));
expect
(
finder
,
findsOneWidget
);
await
tester
.
tap
(
find
.
byKey
(
const
Key
(
'scroll-button'
)));
await
tester
.
pumpAndSettle
();
await
tester
.
tap
(
find
.
byKey
(
const
Key
(
'scroll-button'
)));
await
tester
.
pumpAndSettle
();
// TODO: enable screenshot when
// https://github.com/flutter/flutter/issues/68502 is resolved.
await
binding
.
takeScreenshot
(
'wheel_scroll_by_line'
);
});
}
e2etests/web/regular_integration_tests/test_driver/scroll_wheel_integration_test.dart
0 → 100644
浏览文件 @
e4dffc10
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'package:regular_integration_tests/screenshot_support.dart'
as
test
;
Future
<
void
>
main
()
async
{
// TODO: switch to screenshot when
// https://github.com/flutter/flutter/issues/68502 is resolved.
// await test.runTestWithScreenshots();
}
lib/web_ui/lib/src/engine/pointer_binding.dart
浏览文件 @
e4dffc10
...
...
@@ -227,6 +227,8 @@ abstract class _BaseAdapter {
}
mixin
_WheelEventListenerMixin
on
_BaseAdapter
{
static
double
?
_defaultScrollLineHeight
;
List
<
ui
.
PointerData
>
_convertWheelEventToPointerData
(
html
.
WheelEvent
event
)
{
...
...
@@ -240,8 +242,9 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
double
deltaY
=
event
.
deltaY
as
double
;
switch
(
event
.
deltaMode
)
{
case
domDeltaLine:
deltaX
*=
32.0
;
deltaY
*=
32.0
;
_defaultScrollLineHeight
??=
_computeDefaultScrollLineHeight
();
deltaX
*=
_defaultScrollLineHeight
!;
deltaY
*=
_defaultScrollLineHeight
!;
break
;
case
domDeltaPage:
deltaX
*=
ui
.
window
.
physicalSize
.
width
;
...
...
@@ -251,6 +254,7 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
default
:
break
;
}
final
List
<
ui
.
PointerData
>
data
=
<
ui
.
PointerData
>[];
_pointerDataConverter
.
convert
(
data
,
...
...
@@ -285,6 +289,27 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
]
);
}
/// For browsers that report delta line instead of pixels such as FireFox
/// compute line height using the default font size.
///
/// Use Firefox to test this code path.
double
_computeDefaultScrollLineHeight
()
{
const
double
kFallbackFontHeight
=
16.0
;
final
html
.
DivElement
probe
=
html
.
DivElement
();
probe
.
style
..
fontSize
=
'initial'
..
display
=
'none'
;
html
.
document
.
body
!.
append
(
probe
);
String
fontSize
=
probe
.
getComputedStyle
().
fontSize
;
double
?
res
;
if
(
fontSize
.
contains
(
'px'
))
{
fontSize
=
fontSize
.
replaceAll
(
'px'
,
''
);
res
=
double
.
tryParse
(
fontSize
);
}
probe
.
remove
();
return
res
==
null
?
kFallbackFontHeight
:
res
/
4.0
;
}
}
@immutable
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录