Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
fc1c6821
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,发现更多精彩内容 >>
提交
fc1c6821
编写于
8月 03, 2015
作者:
A
Adam Barth
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #424 from abarth/scrollable_block_cannot_overscroll
ScrollableBlock should be able to overscroll
上级
264e00c7
cf293bba
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
13 deletion
+20
-13
sky/packages/sky/lib/animation/scroll_behavior.dart
sky/packages/sky/lib/animation/scroll_behavior.dart
+18
-11
sky/packages/sky/lib/widgets/scrollable.dart
sky/packages/sky/lib/widgets/scrollable.dart
+2
-2
未找到文件。
sky/packages/sky/lib/animation/scroll_behavior.dart
浏览文件 @
fc1c6821
...
@@ -54,15 +54,6 @@ Simulation createDefaultScrollSimulation(double position, double velocity, doubl
...
@@ -54,15 +54,6 @@ Simulation createDefaultScrollSimulation(double position, double velocity, doubl
return
new
ScrollSimulation
(
position
,
velocityPerSecond
,
minScrollOffset
,
maxScrollOffset
,
spring
,
drag
);
return
new
ScrollSimulation
(
position
,
velocityPerSecond
,
minScrollOffset
,
maxScrollOffset
,
spring
,
drag
);
}
}
class
FlingBehavior
extends
BoundedBehavior
{
FlingBehavior
({
double
contentsSize:
0.0
,
double
containerSize:
0.0
})
:
super
(
contentsSize:
contentsSize
,
containerSize:
containerSize
);
Simulation
release
(
double
position
,
double
velocity
)
{
return
createDefaultScrollSimulation
(
position
,
velocity
,
minScrollOffset
,
maxScrollOffset
);
}
}
class
OverscrollBehavior
extends
BoundedBehavior
{
class
OverscrollBehavior
extends
BoundedBehavior
{
OverscrollBehavior
({
double
contentsSize:
0.0
,
double
containerSize:
0.0
})
OverscrollBehavior
({
double
contentsSize:
0.0
,
double
containerSize:
0.0
})
:
super
(
contentsSize:
contentsSize
,
containerSize:
containerSize
);
:
super
(
contentsSize:
contentsSize
,
containerSize:
containerSize
);
...
@@ -79,11 +70,27 @@ class OverscrollBehavior extends BoundedBehavior {
...
@@ -79,11 +70,27 @@ class OverscrollBehavior extends BoundedBehavior {
// Notice that we clamp the "old" value to 0.0 so that we only
// Notice that we clamp the "old" value to 0.0 so that we only
// reduce the portion of scrollDelta that's applied beyond 0.0. We
// reduce the portion of scrollDelta that's applied beyond 0.0. We
// do similar things for overscroll in the other direction.
// do similar things for overscroll in the other direction.
if
(
newScrollOffset
<
0.0
)
{
if
(
newScrollOffset
<
minScrollOffset
)
{
newScrollOffset
-=
(
newScrollOffset
-
math
.
min
(
0.0
,
scrollOffset
))
/
2.0
;
newScrollOffset
-=
(
newScrollOffset
-
math
.
min
(
minScrollOffset
,
scrollOffset
))
/
2.0
;
}
else
if
(
newScrollOffset
>
maxScrollOffset
)
{
}
else
if
(
newScrollOffset
>
maxScrollOffset
)
{
newScrollOffset
-=
(
newScrollOffset
-
math
.
max
(
maxScrollOffset
,
scrollOffset
))
/
2.0
;
newScrollOffset
-=
(
newScrollOffset
-
math
.
max
(
maxScrollOffset
,
scrollOffset
))
/
2.0
;
}
}
return
newScrollOffset
;
return
newScrollOffset
;
}
}
}
}
class
OverscrollWhenScrollableBehavior
extends
OverscrollBehavior
{
bool
get
isScrollable
=>
contentsSize
>
containerSize
;
Simulation
release
(
double
position
,
double
velocity
)
{
if
(
isScrollable
||
position
<
minScrollOffset
||
position
>
maxScrollOffset
)
return
super
.
release
(
position
,
velocity
);
return
null
;
}
double
applyCurve
(
double
scrollOffset
,
double
scrollDelta
)
{
if
(
isScrollable
)
return
super
.
applyCurve
(
scrollOffset
,
scrollDelta
);
return
minScrollOffset
;
}
}
sky/packages/sky/lib/widgets/scrollable.dart
浏览文件 @
fc1c6821
...
@@ -224,8 +224,8 @@ class ScrollableViewport extends Scrollable {
...
@@ -224,8 +224,8 @@ class ScrollableViewport extends Scrollable {
super
.
syncFields
(
source
);
super
.
syncFields
(
source
);
}
}
ScrollBehavior
createScrollBehavior
()
=>
new
Fling
Behavior
();
ScrollBehavior
createScrollBehavior
()
=>
new
OverscrollWhenScrollable
Behavior
();
Fling
Behavior
get
scrollBehavior
=>
super
.
scrollBehavior
;
OverscrollWhenScrollable
Behavior
get
scrollBehavior
=>
super
.
scrollBehavior
;
double
_viewportHeight
=
0.0
;
double
_viewportHeight
=
0.0
;
double
_childHeight
=
0.0
;
double
_childHeight
=
0.0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录