Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
1fcc5071
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,发现更多精彩内容 >>
提交
1fcc5071
编写于
7月 17, 2015
作者:
C
Collin Jackson
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #110 from collinjackson/baseline2
Track overflow during flex layout and fix stocks row R=hixie
上级
81611c57
329fb964
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
3 deletion
+18
-3
sky/sdk/example/stocks/lib/stock_row.dart
sky/sdk/example/stocks/lib/stock_row.dart
+3
-1
sky/sdk/lib/rendering/flex.dart
sky/sdk/lib/rendering/flex.dart
+15
-2
未找到文件。
sky/sdk/example/stocks/lib/stock_row.dart
浏览文件 @
1fcc5071
...
...
@@ -59,7 +59,9 @@ class StockRow extends Component {
child:
new
StockArrow
(
percentChange:
stock
.
percentChange
),
margin:
const
EdgeDims
.
only
(
right:
5.0
)
),
new
Flex
(
children
,
alignItems:
FlexAlignItems
.
baseline
)
new
Flexible
(
child:
new
Flex
(
children
,
alignItems:
FlexAlignItems
.
baseline
)
)
])
)
);
...
...
sky/sdk/lib/rendering/flex.dart
浏览文件 @
1fcc5071
...
...
@@ -81,6 +81,8 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
}
}
bool
_overflowOccurredDuringLayout
=
false
;
void
setupParentData
(
RenderBox
child
)
{
if
(
child
.
parentData
is
!
FlexBoxParentData
)
child
.
parentData
=
new
FlexBoxParentData
();
...
...
@@ -376,16 +378,20 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
break
;
}
Size
desiredSize
;
switch
(
_direction
)
{
case
FlexDirection
.
horizontal
:
size
=
constraints
.
constrain
(
new
Size
(
mainSize
,
crossSize
));
desiredSize
=
new
Size
(
mainSize
,
crossSize
);
size
=
constraints
.
constrain
(
desiredSize
);
crossSize
=
size
.
height
;
break
;
case
FlexDirection
.
vertical
:
desiredSize
=
new
Size
(
crossSize
,
mainSize
);
size
=
constraints
.
constrain
(
new
Size
(
crossSize
,
mainSize
));
crossSize
=
size
.
width
;
break
;
}
_overflowOccurredDuringLayout
=
desiredSize
!=
size
;
// Position elements
double
childMainPosition
=
leadingSpace
;
...
...
@@ -433,6 +439,13 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
}
void
paint
(
PaintingCanvas
canvas
,
Offset
offset
)
{
defaultPaint
(
canvas
,
offset
);
if
(
_overflowOccurredDuringLayout
)
{
canvas
.
save
();
canvas
.
clipRect
(
offset
&
size
);
defaultPaint
(
canvas
,
offset
);
canvas
.
restore
();
}
else
{
defaultPaint
(
canvas
,
offset
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录