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
d0240c4e
Commit
d0240c4e
authored
Feb 08, 2016
by
Adam Barth
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ParentData#merge
There aren't any clients anymore. Fixes #1684
parent
8d5fd3dc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
40 deletions
+0
-40
custom_layout.dart
packages/flutter/lib/src/rendering/custom_layout.dart
+0
-6
flex.dart
packages/flutter/lib/src/rendering/flex.dart
+0
-6
grid.dart
packages/flutter/lib/src/rendering/grid.dart
+0
-6
object.dart
packages/flutter/lib/src/rendering/object.dart
+0
-6
stack.dart
packages/flutter/lib/src/rendering/stack.dart
+0
-16
No files found.
packages/flutter/lib/src/rendering/custom_layout.dart
View file @
d0240c4e
...
...
@@ -11,12 +11,6 @@ class MultiChildLayoutParentData extends ContainerBoxParentDataMixin<RenderBox>
/// An object representing the identity of this child.
Object
id
;
void
merge
(
MultiChildLayoutParentData
other
)
{
if
(
other
.
id
!=
null
)
id
=
other
.
id
;
super
.
merge
(
other
);
}
String
toString
()
=>
'
${super.toString()}
; id=
$id
'
;
}
...
...
packages/flutter/lib/src/rendering/flex.dart
View file @
d0240c4e
...
...
@@ -17,12 +17,6 @@ class FlexParentData extends ContainerBoxParentDataMixin<RenderBox> {
/// according to the flex factors of the flexible children.
int
flex
;
void
merge
(
FlexParentData
other
)
{
if
(
other
.
flex
!=
null
)
flex
=
other
.
flex
;
super
.
merge
(
other
);
}
String
toString
()
=>
'
${super.toString()}
; flex=
$flex
'
;
}
...
...
packages/flutter/lib/src/rendering/grid.dart
View file @
d0240c4e
...
...
@@ -291,12 +291,6 @@ class GridParentData extends ContainerBoxParentDataMixin<RenderBox> {
/// Opaque data passed to the getChildPlacement method of the grid's [GridDelegate].
Object
placementData
;
void
merge
(
GridParentData
other
)
{
if
(
other
.
placementData
!=
null
)
placementData
=
other
.
placementData
;
super
.
merge
(
other
);
}
String
toString
()
=>
'
${super.toString()}
; placementData=
$placementData
'
;
}
...
...
packages/flutter/lib/src/rendering/object.dart
View file @
d0240c4e
...
...
@@ -30,12 +30,6 @@ class ParentData {
/// Called when the RenderObject is removed from the tree.
void
detach
()
{
}
/// Override this function in subclasses to merge in data from other instance
/// into this instance.
void
merge
(
ParentData
other
)
{
assert
(
other
.
runtimeType
==
this
.
runtimeType
);
}
String
toString
()
=>
'<none>'
;
}
...
...
packages/flutter/lib/src/rendering/stack.dart
View file @
d0240c4e
...
...
@@ -164,22 +164,6 @@ class StackParentData extends ContainerBoxParentDataMixin<RenderBox> {
left
=
value
.
left
;
}
void
merge
(
StackParentData
other
)
{
if
(
other
.
top
!=
null
)
top
=
other
.
top
;
if
(
other
.
right
!=
null
)
right
=
other
.
right
;
if
(
other
.
bottom
!=
null
)
bottom
=
other
.
bottom
;
if
(
other
.
left
!=
null
)
left
=
other
.
left
;
if
(
other
.
width
!=
null
)
width
=
other
.
width
;
if
(
other
.
height
!=
null
)
height
=
other
.
height
;
super
.
merge
(
other
);
}
/// Whether this child is considered positioned
///
/// A child is positioned if any of the top, right, bottom, or left offsets
...
...
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