Skip to content

Commit

Permalink
add nullable
Browse files Browse the repository at this point in the history
  • Loading branch information
@xtuzy
xtuzy committed Oct 2, 2022
1 parent 457d65a commit 3602374
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions SharpConstraintLayout.Maui/Widget/ConstraintLayout.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,10 +581,10 @@ public Size MeasureLayout(Size availableSize, int horizontalSpec = 0, int vertic
if (MEASURE_MEASURELAYOUT)
{
updateHierarchySW.Stop();
Logger.LogInformation($"{this} updateHierarchy time: {updateHierarchySW.Elapsed.TotalMilliseconds.ToString("0.000")} ms");
Logger?.LogInformation($"{this} updateHierarchy time: {updateHierarchySW.Elapsed.TotalMilliseconds.ToString("0.000")} ms");
}

if (DEBUG) Logger.LogDebug($"{nameof(MeasureLayout)} {this.GetType().FullName} {availableSize} Spec=({AndroidMeasureSpec.ToString(horizontalSpec)} x {AndroidMeasureSpec.ToString(verticalSpec)})");
if (DEBUG) Logger?.LogDebug($"{nameof(MeasureLayout)} {this.GetType().FullName} {availableSize} Spec=({AndroidMeasureSpec.ToString(horizontalSpec)} x {AndroidMeasureSpec.ToString(verticalSpec)})");

MLayoutWidget.Rtl = isRtl();

Expand All @@ -601,7 +601,7 @@ public Size MeasureLayout(Size availableSize, int horizontalSpec = 0, int vertic
if (MEASURE_MEASURELAYOUT)
{
resolveSystemSW.Stop();
Logger.LogInformation($"{this} resolveSystem time: {resolveSystemSW.Elapsed.TotalMilliseconds.ToString("0.000")} ms");
Logger?.LogInformation($"{this} resolveSystem time: {resolveSystemSW.Elapsed.TotalMilliseconds.ToString("0.000")} ms");
}

resolveMeasuredDimension(horizontalSpec, verticalSpec, MLayoutWidget.Width, MLayoutWidget.Height,
Expand Down Expand Up @@ -820,7 +820,7 @@ public void ArrangeLayout()
if (component != null)
{
LayoutChild(component, child.X, child.Y, child.Width, child.Height);
if (DEBUG && ChildCount < 10) Logger.LogDebug($"{nameof(ArrangeLayout)} {component.GetViewLayoutInfo()} Widget={new Rect(child.X, child.Y, child.Width, child.Height)}");
if (DEBUG && ChildCount < 10) Logger?.LogDebug($"{nameof(ArrangeLayout)} {component.GetViewLayoutInfo()} Widget={new Rect(child.X, child.Y, child.Width, child.Height)}");
}

if (component is Placeholder)
Expand Down Expand Up @@ -879,7 +879,7 @@ public virtual void measure(ConstraintWidget widget, BasicMeasure.Measure measur
if (MEASUREEVERYWIDGET)
{
sw.Stop();
outerInstance.Logger.LogInformation($"{widget.CompanionWidget} widget measure time: {sw.Elapsed.TotalMilliseconds.ToString("0.000")} ms");
outerInstance.Logger?.LogInformation($"{widget.CompanionWidget} widget measure time: {sw.Elapsed.TotalMilliseconds.ToString("0.000")} ms");
}
}

Expand Down Expand Up @@ -962,7 +962,7 @@ public void AndroidSourceCodeMeasureUseSpecForWindows(ConstraintWidget widget, B
if (MEASUREEVERYCHILD)
{
sw.Stop();
outerInstance.Logger.LogInformation($"{widget.CompanionWidget} measure time: {sw.Elapsed.TotalMilliseconds.ToString("0.000")} ms");
outerInstance.Logger?.LogInformation($"{widget.CompanionWidget} measure time: {sw.Elapsed.TotalMilliseconds.ToString("0.000")} ms");
}

switch (horizontalBehavior)
Expand Down Expand Up @@ -1123,9 +1123,9 @@ public void AndroidSourceCodeMeasureUseSpecForWindows(ConstraintWidget widget, B
if (child is VirtualLayout && widget is androidx.constraintlayout.core.widgets.VirtualLayout)
{
androidx.constraintlayout.core.widgets.VirtualLayout layout = (androidx.constraintlayout.core.widgets.VirtualLayout)widget;
if (DEBUG) outerInstance.Logger.LogDebug($"{child.GetType().FullName} before onMeasure: widget={widget},spec=({MeasureSpec.GetSize(horizontalSpec)} x {MeasureSpec.GetSize(verticalSpec)})");
if (DEBUG) outerInstance.Logger?.LogDebug($"{child.GetType().FullName} before onMeasure: widget={widget},spec=({MeasureSpec.GetSize(horizontalSpec)} x {MeasureSpec.GetSize(verticalSpec)})");
((VirtualLayout)child).onMeasure(layout, horizontalSpec, verticalSpec);
if (DEBUG) outerInstance.Logger.LogDebug($"{child.GetType().FullName} after onMeasure: widget={widget},control={child.GetViewLayoutInfo()}");
if (DEBUG) outerInstance.Logger?.LogDebug($"{child.GetType().FullName} after onMeasure: widget={widget},control={child.GetViewLayoutInfo()}");
#if __MAUI__
//(w, h) = ((int)child.WidthRequest, (int)child.HeightRequest);
var size = (child as VirtualLayout).MeasuredSize;
Expand All @@ -1140,13 +1140,13 @@ public void AndroidSourceCodeMeasureUseSpecForWindows(ConstraintWidget widget, B
}
else
{
if (DEBUG) outerInstance.Logger.LogDebug($"{child.GetType().FullName} before onMeasure: widget={widget},control={child.GetWrapContentSize()},spec=({AndroidMeasureSpec.GetSize(horizontalSpec)} x {AndroidMeasureSpec.GetSize(verticalSpec)})");
if (DEBUG) outerInstance.Logger?.LogDebug($"{child.GetType().FullName} before onMeasure: widget={widget},control={child.GetWrapContentSize()},spec=({AndroidMeasureSpec.GetSize(horizontalSpec)} x {AndroidMeasureSpec.GetSize(verticalSpec)})");
#if __IOS__ && !__MAUI__
(w, h) = (UIElementExtension.GetDefaultSize(childCurrentPlatformMeasuredSize.Width, horizontalSpec), UIElementExtension.GetDefaultSize(childCurrentPlatformMeasuredSize.Height, verticalSpec));//iOS没有Measure函数,只需要使用当前的测量值即可
#else
(w, h) = child.MeasureSelf(horizontalSpec, verticalSpec);
#endif
if (DEBUG) outerInstance.Logger.LogDebug($"{child.GetType().FullName} after onMeasure: widget={widget},control={child.GetWrapContentSize()},measured=({w} x {h})");
if (DEBUG) outerInstance.Logger?.LogDebug($"{child.GetType().FullName} after onMeasure: widget={widget},control={child.GetWrapContentSize()},measured=({w} x {h})");
}
widget.setLastMeasureSpec(horizontalSpec, verticalSpec);

Expand All @@ -1162,7 +1162,7 @@ public void AndroidSourceCodeMeasureUseSpecForWindows(ConstraintWidget widget, B
if (DEBUG)
{
string measurement = $"spec ({AndroidMeasureSpec.ToString(horizontalSpec)} x {AndroidMeasureSpec.ToString(verticalSpec)}) => ({width} {height})";
outerInstance.Logger.LogDebug($"{child.GetType().FullName} platform measure result: {measurement}");
outerInstance.Logger?.LogDebug($"{child.GetType().FullName} platform measure result: {measurement}");
}

if (widget.mMatchConstraintMinWidth > 0)
Expand Down Expand Up @@ -1219,7 +1219,7 @@ public void AndroidSourceCodeMeasureUseSpecForWindows(ConstraintWidget widget, B
if (DEBUG)
{
string measurement2 = AndroidMeasureSpec.ToString(horizontalSpec) + " x " + AndroidMeasureSpec.ToString(verticalSpec) + " => " + width + " x " + height;
outerInstance.Logger.LogDebug("measure (b) " + widget.DebugName + " : " + measurement2);
outerInstance.Logger?.LogDebug("measure (b) " + widget.DebugName + " : " + measurement2);
}
}
#endif
Expand Down

0 comments on commit 3602374

Please sign in to comment.