Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
bf6ae3ee
Commit
bf6ae3ee
authored
Jun 01, 2016
by
Ian Hickson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reenable the gallery smoke test (#4303)
...and fix some grid and table intrinsic issues it uncovered.
parent
9e9dfc3d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
smoke_test.dart
examples/flutter_gallery/test/smoke_test.dart
+1
-2
grid.dart
packages/flutter/lib/src/rendering/grid.dart
+15
-1
table.dart
packages/flutter/lib/src/rendering/table.dart
+1
-1
No files found.
examples/flutter_gallery/test/smoke_test.dart
View file @
bf6ae3ee
...
...
@@ -109,6 +109,5 @@ void main() {
await
tester
.
tap
(
find
.
text
(
'Light'
));
await
tester
.
pump
();
await
tester
.
pump
(
const
Duration
(
seconds:
1
));
// Wait until it's changed.
},
skip:
true
);
});
}
packages/flutter/lib/src/rendering/grid.dart
View file @
bf6ae3ee
...
...
@@ -292,6 +292,10 @@ abstract class GridDelegateWithInOrderChildPlacement extends GridDelegate {
/// A [GridDelegate] that divides the grid's width evenly for a fixed number of columns.
///
/// Grids using this delegate cannot validly be placed inside an unconstrained
/// horizontal space, since they attempt to divide the incoming horizontal
/// maximum width constraint.
class
FixedColumnCountGridDelegate
extends
GridDelegateWithInOrderChildPlacement
{
/// Creates a grid delegate that uses a fixed column count.
///
...
...
@@ -349,7 +353,17 @@ class FixedColumnCountGridDelegate extends GridDelegateWithInOrderChildPlacement
return
0.0
;
}
// TODO(ianh): Provide efficient intrinsic height functions.
@override
double
getMinIntrinsicHeight
(
double
width
,
int
childCount
)
{
// TODO(ianh): Strictly, this should examine the children.
return
0.0
;
}
@override
double
getMaxIntrinsicHeight
(
double
width
,
int
childCount
)
{
// TODO(ianh): Strictly, this should examine the children.
return
0.0
;
}
}
/// A [GridDelegate] that fills the width with a variable number of tiles.
...
...
packages/flutter/lib/src/rendering/table.dart
View file @
bf6ae3ee
...
...
@@ -892,7 +892,6 @@ class RenderTable extends RenderBox {
if
(
flexes
[
x
]
!=
null
)
{
final
double
newWidth
=
widths
[
x
]
-
deficit
*
flexes
[
x
]
/
totalFlex
;
assert
(
newWidth
.
isFinite
);
assert
(
newWidth
>=
0.0
);
if
(
newWidth
<=
minWidths
[
x
])
{
// shrank to minimum
deficit
-=
widths
[
x
]
-
minWidths
[
x
];
...
...
@@ -904,6 +903,7 @@ class RenderTable extends RenderBox {
widths
[
x
]
=
newWidth
;
newTotalFlex
+=
flexes
[
x
];
}
assert
(
widths
[
x
]
>=
0.0
);
}
}
totalFlex
=
newTotalFlex
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment