Skip to content

Commit 060bf2b

Browse files
SaadArdatiBirjuVachhani
authored andcommitted
Grid View #10
1 parent 14f2dbb commit 060bf2b

File tree

2 files changed

+13
-23
lines changed

2 files changed

+13
-23
lines changed

lib/src/api/models/box_constraints.dart

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -203,26 +203,18 @@ class BoxConstraintsModel with EquatableMixin, SerializableMixin {
203203
/// [returns] a [BoxConstraintsModel] that has overlapping constraints.
204204
BoxConstraintsModel union(BoxConstraintsModel constraints) {
205205
return BoxConstraintsModel(
206-
minWidth: (minWidth == null)
207-
? constraints.minWidth
208-
: (constraints.minWidth == null)
209-
? minWidth
210-
: max(minWidth!, constraints.minWidth!),
211-
maxWidth: (maxWidth == null)
212-
? constraints.maxWidth
213-
: (constraints.maxWidth == null)
214-
? maxWidth
215-
: min(maxWidth!, constraints.maxWidth!),
216-
minHeight: (minHeight == null)
217-
? constraints.minHeight
218-
: (constraints.minHeight == null)
219-
? minHeight
220-
: max(minHeight!, constraints.minHeight!),
221-
maxHeight: (maxHeight == null)
222-
? constraints.maxHeight
223-
: (constraints.maxHeight == null)
224-
? maxHeight
225-
: min(maxHeight!, constraints.maxHeight!),
206+
minWidth: (minWidth == null || constraints.minWidth == null)
207+
? minWidth ?? constraints.minWidth
208+
: max(minWidth!, constraints.minWidth!),
209+
minHeight: (minHeight == null || constraints.minHeight == null)
210+
? minHeight ?? constraints.minHeight
211+
: max(minHeight!, constraints.minHeight!),
212+
maxWidth: (maxWidth == null || constraints.maxWidth == null)
213+
? maxWidth ?? constraints.maxWidth
214+
: min(maxWidth!, constraints.maxWidth!),
215+
maxHeight: (maxHeight == null || constraints.maxHeight == null)
216+
? maxHeight ?? constraints.maxHeight
217+
: min(maxHeight!, constraints.maxHeight!),
226218
);
227219
}
228220

lib/src/api/node_processor.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,7 @@ class NodeProcessor {
193193
final BoxConstraintsModel? relegatedConstraints =
194194
parent.relegatedConstraintsToChildren(node);
195195
if (relegatedConstraints != null) {
196-
final parentResolved =
197-
relegatedConstraints.union(resolveConstraints(parent));
198-
resolved = resolved.union(parentResolved);
196+
resolved = resolved.union(resolved);
199197
}
200198
}
201199

0 commit comments

Comments
 (0)