From 4ef9639f3e07b1dbf5b31acf628b9d459fe27857 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sat, 26 Dec 2015 20:51:36 +0000 Subject: [PATCH] Removed LINQ from MeasureOverride. And removed empty MeasureOverride methods. --- src/Perspex.Controls/Primitives/ScrollBar.cs | 6 ------ src/Perspex.Controls/ScrollViewer.cs | 6 ------ src/Perspex.Layout/Layoutable.cs | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/Perspex.Controls/Primitives/ScrollBar.cs b/src/Perspex.Controls/Primitives/ScrollBar.cs index adaad0c2d6..06961d569f 100644 --- a/src/Perspex.Controls/Primitives/ScrollBar.cs +++ b/src/Perspex.Controls/Primitives/ScrollBar.cs @@ -72,12 +72,6 @@ namespace Perspex.Controls.Primitives set { SetValue(OrientationProperty, value); } } - /// - protected override Size MeasureOverride(Size availableSize) - { - return base.MeasureOverride(availableSize); - } - /// /// Calculates whether the scrollbar should be visible. /// diff --git a/src/Perspex.Controls/ScrollViewer.cs b/src/Perspex.Controls/ScrollViewer.cs index b454bc6d5e..f8a712cd6a 100644 --- a/src/Perspex.Controls/ScrollViewer.cs +++ b/src/Perspex.Controls/ScrollViewer.cs @@ -231,12 +231,6 @@ namespace Perspex.Controls return new Vector(Clamp(offset.X, 0, maxX), Clamp(offset.Y, 0, maxY)); } - /// - protected override Size MeasureOverride(Size availableSize) - { - return base.MeasureOverride(availableSize); - } - private static double Clamp(double value, double min, double max) { return (value < min) ? min : (value > max) ? max : value; diff --git a/src/Perspex.Layout/Layoutable.cs b/src/Perspex.Layout/Layoutable.cs index c751e80cdc..329719187c 100644 --- a/src/Perspex.Layout/Layoutable.cs +++ b/src/Perspex.Layout/Layoutable.cs @@ -490,7 +490,7 @@ namespace Perspex.Layout double width = 0; double height = 0; - foreach (ILayoutable child in this.GetVisualChildren().OfType()) + foreach (ILayoutable child in this.GetVisualChildren()) { child.Measure(availableSize); width = Math.Max(width, child.DesiredSize.Width);