@@ -77,15 +77,13 @@ protected Layouter(IFrameworkElement element)
77
77
/// <returns>The size of the panel, in logical pixel.</returns>
78
78
public Size Measure ( Size availableSize )
79
79
{
80
- IDisposable traceActivity = null ;
81
- if ( _trace . IsEnabled )
82
- {
83
- traceActivity = _trace . WriteEventActivity (
80
+ using var traceActivity = _trace . IsEnabled
81
+ ? _trace . WriteEventActivity (
84
82
FrameworkElement . TraceProvider . FrameworkElement_MeasureStart ,
85
83
FrameworkElement . TraceProvider . FrameworkElement_MeasureStop ,
86
- new object [ ] { LoggingOwnerTypeName , Panel . GetDependencyObjectId ( ) }
87
- ) ;
88
- }
84
+ new object [ ] { LoggingOwnerTypeName , Panel . GetDependencyObjectId ( ) }
85
+ )
86
+ : null ;
89
87
90
88
if ( Panel . Visibility == Visibility . Collapsed )
91
89
{
@@ -154,7 +152,6 @@ public Size Measure(Size availableSize)
154
152
{
155
153
UIElement . IsLayoutingVisualTreeRoot = false ;
156
154
}
157
- traceActivity ? . Dispose ( ) ;
158
155
}
159
156
}
160
157
@@ -178,15 +175,13 @@ public void Arrange(Rect finalRect)
178
175
{
179
176
LayoutInformation . SetLayoutSlot ( Panel , finalRect ) ;
180
177
181
- IDisposable traceActivity = null ;
182
- if ( _trace . IsEnabled )
183
- {
184
- traceActivity = _trace . WriteEventActivity (
178
+ using var traceActivity = _trace . IsEnabled
179
+ ? _trace . WriteEventActivity (
185
180
FrameworkElement . TraceProvider . FrameworkElement_ArrangeStart ,
186
181
FrameworkElement . TraceProvider . FrameworkElement_ArrangeStop ,
187
- new object [ ] { LoggingOwnerTypeName , Panel . GetDependencyObjectId ( ) }
188
- ) ;
189
- }
182
+ new object [ ] { LoggingOwnerTypeName , Panel . GetDependencyObjectId ( ) }
183
+ )
184
+ : null ;
190
185
191
186
try
192
187
{
@@ -288,7 +283,6 @@ public void Arrange(Rect finalRect)
288
283
{
289
284
UIElement . IsLayoutingVisualTreeRoot = false ;
290
285
}
291
- traceActivity ? . Dispose ( ) ;
292
286
}
293
287
}
294
288
0 commit comments