diff --git a/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs b/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs index afb024b4cb..99971477c4 100644 --- a/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs +++ b/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs @@ -215,8 +215,6 @@ namespace Perspex.Cairo.Media } } - private static Random Random = new Random(); - /// /// Pushes a clip rectange. /// diff --git a/src/Gtk/Perspex.Gtk/WindowImpl.cs b/src/Gtk/Perspex.Gtk/WindowImpl.cs index 0e87911b80..d19f3a120c 100644 --- a/src/Gtk/Perspex.Gtk/WindowImpl.cs +++ b/src/Gtk/Perspex.Gtk/WindowImpl.cs @@ -379,10 +379,5 @@ namespace Perspex.Gtk Input(e); return true; } - - private IPlatformHandle GetHandle(Gdk.Window window) - { - return new PlatformHandle(window.Handle, "GdkWindow"); - } } } diff --git a/src/Markup/Perspex.Markup.Xaml/Data/Binding.cs b/src/Markup/Perspex.Markup.Xaml/Data/Binding.cs index 1d9d91d8e0..33ae02748b 100644 --- a/src/Markup/Perspex.Markup.Xaml/Data/Binding.cs +++ b/src/Markup/Perspex.Markup.Xaml/Data/Binding.cs @@ -226,21 +226,6 @@ namespace Perspex.Markup.Xaml.Data return result; } - private IControl LookupNamedControl(IControl target) - { - Contract.Requires(target != null); - - var nameScope = target.FindNameScope(); - - if (nameScope == null) - { - throw new InvalidOperationException( - "Could not find name scope for ElementName binding."); - } - - return nameScope.Find(ElementName); - } - private class PathInfo { public string Path { get; set; } diff --git a/src/Perspex.Base/PerspexObject.cs b/src/Perspex.Base/PerspexObject.cs index 5a0e1f5cf8..c1f1d246d0 100644 --- a/src/Perspex.Base/PerspexObject.cs +++ b/src/Perspex.Base/PerspexObject.cs @@ -678,16 +678,6 @@ namespace Perspex } } - /// - /// Gets a description of a property that van be used in observables. - /// - /// The property - /// The description. - private string GetDescription(PerspexProperty property) - { - return $"{GetType().Name}.{property.Name}"; - } - /// /// Gets a description of an observable that van be used in logs. /// diff --git a/src/Perspex.Controls/ContextMenu.cs b/src/Perspex.Controls/ContextMenu.cs index c241a2dae0..861969547a 100644 --- a/src/Perspex.Controls/ContextMenu.cs +++ b/src/Perspex.Controls/ContextMenu.cs @@ -119,17 +119,6 @@ } } - private void PopupOpened(object sender, EventArgs e) - { - var selectedIndex = SelectedIndex; - - if (selectedIndex != -1) - { - var container = ItemContainerGenerator.ContainerFromIndex(selectedIndex); - container?.Focus(); - } - } - private static void ControlPointerReleased(object sender, PointerReleasedEventArgs e) { var control = (Control)sender; diff --git a/src/Perspex.Controls/Grid.cs b/src/Perspex.Controls/Grid.cs index dc25d29262..65bf029008 100644 --- a/src/Perspex.Controls/Grid.cs +++ b/src/Perspex.Controls/Grid.cs @@ -876,14 +876,6 @@ namespace Perspex.Controls Stars = 0; Type = type; } - - public void Init(double offeredSize, double min, double max, GridUnitType type) - { - OfferedSize = offeredSize; - Min = min; - Max = max; - Type = type; - } } private struct GridNode diff --git a/src/Perspex.Controls/MenuItem.cs b/src/Perspex.Controls/MenuItem.cs index ad03a1303f..a44516873a 100644 --- a/src/Perspex.Controls/MenuItem.cs +++ b/src/Perspex.Controls/MenuItem.cs @@ -447,13 +447,6 @@ namespace Perspex.Controls /// public static readonly DependencyResolver Instance = new DependencyResolver(); - /// - /// Disposes of all managed resources. - /// - public void Dispose() - { - } - /// /// Gets a service of the specified type. /// diff --git a/src/Perspex.Controls/Mixins/ContentControlMixin.cs b/src/Perspex.Controls/Mixins/ContentControlMixin.cs index 2435a266f7..a935fafc00 100644 --- a/src/Perspex.Controls/Mixins/ContentControlMixin.cs +++ b/src/Perspex.Controls/Mixins/ContentControlMixin.cs @@ -118,13 +118,6 @@ namespace Perspex.Controls.Mixins }); } - private static event EventHandler TemplateApplied; - - private static void OnTemplateApplied(object sender, RoutedEventArgs e) - { - TemplateApplied?.Invoke(sender, (TemplateAppliedEventArgs)e); - } - private static void UpdateLogicalChild( IControl control, IPerspexList logicalChildren, diff --git a/src/Perspex.Controls/Presenters/ScrollContentPresenter.cs b/src/Perspex.Controls/Presenters/ScrollContentPresenter.cs index 1b60e1c834..d9af0b3b6e 100644 --- a/src/Perspex.Controls/Presenters/ScrollContentPresenter.cs +++ b/src/Perspex.Controls/Presenters/ScrollContentPresenter.cs @@ -256,13 +256,5 @@ namespace Perspex.Controls.Presenters Extent = scrollable.Extent; Offset = scrollable.Offset; } - - private static Vector ValidateOffset(ScrollContentPresenter o, Vector value) - { - return ScrollViewer.CoerceOffset( - o.GetValue(ExtentProperty), - o.GetValue(ViewportProperty), - value); - } } } diff --git a/src/Skia/Perspex.Skia/DrawingContextImpl.cs b/src/Skia/Perspex.Skia/DrawingContextImpl.cs index 8e7d481433..61f4bc4a4d 100644 --- a/src/Skia/Perspex.Skia/DrawingContextImpl.cs +++ b/src/Skia/Perspex.Skia/DrawingContextImpl.cs @@ -180,7 +180,7 @@ namespace Perspex.Skia public void PopOpacity() => _settings->Opacity = _opacityStack.Pop(); private Matrix _currentTransform = Matrix.Identity; - private readonly float[] _fmatrix = new float[6]; + public Matrix Transform { get { return _currentTransform; } diff --git a/tests/Perspex.Base.UnitTests/PerspexObjectTests_Binding.cs b/tests/Perspex.Base.UnitTests/PerspexObjectTests_Binding.cs index 418c4bd7bc..40f542ae76 100644 --- a/tests/Perspex.Base.UnitTests/PerspexObjectTests_Binding.cs +++ b/tests/Perspex.Base.UnitTests/PerspexObjectTests_Binding.cs @@ -262,9 +262,6 @@ namespace Perspex.Base.UnitTests public static readonly StyledProperty FooProperty = PerspexProperty.Register("Foo", "foodefault"); - public static readonly StyledProperty BazProperty = - PerspexProperty.Register("Baz", "bazdefault", true); - public static readonly StyledProperty QuxProperty = PerspexProperty.Register("Qux", 5.6); } diff --git a/tests/Perspex.Base.UnitTests/PerspexObjectTests_Metadata.cs b/tests/Perspex.Base.UnitTests/PerspexObjectTests_Metadata.cs index c3ff947a4d..316971c7de 100644 --- a/tests/Perspex.Base.UnitTests/PerspexObjectTests_Metadata.cs +++ b/tests/Perspex.Base.UnitTests/PerspexObjectTests_Metadata.cs @@ -51,24 +51,12 @@ namespace Perspex.Base.UnitTests { public static readonly StyledProperty FooProperty = PerspexProperty.Register("Foo"); - - public static readonly StyledProperty BazProperty = - PerspexProperty.Register("Baz"); - - public static readonly StyledProperty QuxProperty = - PerspexProperty.Register("Qux"); } private class Class2 : Class1 { public static readonly StyledProperty BarProperty = PerspexProperty.Register("Bar"); - - public static readonly StyledProperty FlobProperty = - PerspexProperty.Register("Flob"); - - public static readonly StyledProperty FredProperty = - PerspexProperty.Register("Fred"); } private class AttachedOwner diff --git a/tests/Perspex.Base.UnitTests/StyledPropertyTests.cs b/tests/Perspex.Base.UnitTests/StyledPropertyTests.cs index 6685a08059..9da28bd023 100644 --- a/tests/Perspex.Base.UnitTests/StyledPropertyTests.cs +++ b/tests/Perspex.Base.UnitTests/StyledPropertyTests.cs @@ -35,8 +35,6 @@ namespace Perspex.Base.UnitTests private class Class1 : PerspexObject { - public static readonly StyledProperty FooProperty = - PerspexProperty.Register("Foo", "default"); } private class Class2 : PerspexObject diff --git a/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs index 47547837f9..69959e5806 100644 --- a/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs +++ b/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs @@ -236,15 +236,5 @@ namespace Perspex.Controls.UnitTests // Now the ItemsPresenter should be reigstered, so apply its template. target.Presenter.ApplyTemplate(); } - - private class Item - { - public Item(string value) - { - Value = value; - } - - public string Value { get; } - } } } diff --git a/tests/Perspex.Controls.UnitTests/PanelTests.cs b/tests/Perspex.Controls.UnitTests/PanelTests.cs index 68f6075e2e..34a052645e 100644 --- a/tests/Perspex.Controls.UnitTests/PanelTests.cs +++ b/tests/Perspex.Controls.UnitTests/PanelTests.cs @@ -117,10 +117,5 @@ namespace Perspex.Controls.UnitTests Assert.Equal(new Control[0], panel.Children); Assert.Equal(new ILogical[0], panel.GetLogicalChildren()); } - - private class TestReparent : Panel - { - public new IPerspexList LogicalChildren => base.LogicalChildren; - } } } diff --git a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs index 22f2509e1d..881c436d1d 100644 --- a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs +++ b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs @@ -100,10 +100,5 @@ namespace Perspex.Controls.UnitTests.Primitives SelectionModeProperty.OverrideDefaultValue(SelectionMode.AlwaysSelected); } } - - private class Item : Control, ISelectable - { - public bool IsSelected { get; set; } - } } } diff --git a/tests/Perspex.Controls.UnitTests/Primitives/TemplatedControlTests.cs b/tests/Perspex.Controls.UnitTests/Primitives/TemplatedControlTests.cs index d6e758a88b..4de5d8fd3b 100644 --- a/tests/Perspex.Controls.UnitTests/Primitives/TemplatedControlTests.cs +++ b/tests/Perspex.Controls.UnitTests/Primitives/TemplatedControlTests.cs @@ -328,23 +328,6 @@ namespace Perspex.Controls.UnitTests.Primitives }; } - private static IControl ItemsControlTemplate(ItemsControl control) - { - return new Border - { - Child = new ScrollViewer - { - Template = new FuncControlTemplate(ScrollViewerTemplate), - Content = new ItemsPresenter - { - Name = "PART_ItemsPresenter", - [!ItemsPresenter.ItemsProperty] = control[!ItemsControl.ItemsProperty], - [!ItemsPresenter.ItemsPanelProperty] = control[!ItemsControl.ItemsPanelProperty], - } - } - }; - } - private static Control ScrollViewerTemplate(ScrollViewer control) { var result = new ScrollContentPresenter @@ -355,16 +338,5 @@ namespace Perspex.Controls.UnitTests.Primitives return result; } - - private class ApplyTemplateTracker : Control - { - public List> Invocations { get; } = new List>(); - - public override void ApplyTemplate() - { - base.ApplyTemplate(); - Invocations.Add(Tuple.Create(this.GetVisualParent(), this.GetLogicalParent())); - } - } } } \ No newline at end of file diff --git a/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs b/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs index dba82f976e..26136a84d8 100644 --- a/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs +++ b/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs @@ -84,17 +84,5 @@ namespace Perspex.Controls.UnitTests }, }; } - - private Control CreateNestedTemplate(ContentControl control) - { - return new ScrollViewer - { - Template = new FuncControlTemplate(CreateTemplate), - Content = new ContentPresenter - { - Name = "PART_ContentPresenter", - } - }; - } } } \ No newline at end of file diff --git a/tests/Perspex.Controls.UnitTests/TopLevelTests.cs b/tests/Perspex.Controls.UnitTests/TopLevelTests.cs index 7d3577f2c7..6a6769d4c1 100644 --- a/tests/Perspex.Controls.UnitTests/TopLevelTests.cs +++ b/tests/Perspex.Controls.UnitTests/TopLevelTests.cs @@ -281,31 +281,6 @@ namespace Perspex.Controls.UnitTests }); } - private void RegisterServices() - { - var fixture = new Fixture().Customize(new AutoMoqCustomization()); - var l = PerspexLocator.CurrentMutable; - - var formattedText = fixture.Create(); - var globalStyles = new Mock(); - var layoutManager = fixture.Create(); - var renderInterface = fixture.Create(); - var renderManager = fixture.Create(); - var windowImpl = new Mock(); - var theme = new Styles(); - - globalStyles.Setup(x => x.Styles).Returns(theme); - - PerspexLocator.CurrentMutable - .Bind().ToConstant(new Mock().Object) - .Bind().ToConstant(new Mock().Object) - .Bind().ToConstant(globalStyles.Object) - .Bind().ToConstant(layoutManager) - .Bind().ToConstant(renderInterface) - .Bind().ToConstant(renderManager) - .Bind().ToConstant(new Styler()); - } - private class TestTopLevel : TopLevel { public TestTopLevel(ITopLevelImpl impl) diff --git a/tests/Perspex.Markup.UnitTests/Data/ExpressionSubjectTests.cs b/tests/Perspex.Markup.UnitTests/Data/ExpressionSubjectTests.cs index 2f11bf1551..cddc71f88a 100644 --- a/tests/Perspex.Markup.UnitTests/Data/ExpressionSubjectTests.cs +++ b/tests/Perspex.Markup.UnitTests/Data/ExpressionSubjectTests.cs @@ -176,11 +176,6 @@ namespace Perspex.Markup.UnitTests.Data public string StringValue { get; set; } public double DoubleValue { get; set; } - - public void RaisePropertyChanged(string propertyName) - { - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); - } } } } diff --git a/tests/Perspex.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs b/tests/Perspex.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs index b8ddd9a280..1979d5d9bf 100644 --- a/tests/Perspex.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs +++ b/tests/Perspex.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs @@ -55,11 +55,6 @@ namespace Perspex.Markup.Xaml.UnitTests.Data BindingPriority.TemplatedParent)); } - private Mock CreateTarget(ITemplatedControl templatedParent) - { - return CreateTarget(templatedParent: templatedParent); - } - private Mock CreateTarget( ITemplatedControl templatedParent = null, string text = null) diff --git a/tests/Perspex.Styling.UnitTests/ActivatedSubjectTests.cs b/tests/Perspex.Styling.UnitTests/ActivatedSubjectTests.cs index 0e3947c5d9..0599430894 100644 --- a/tests/Perspex.Styling.UnitTests/ActivatedSubjectTests.cs +++ b/tests/Perspex.Styling.UnitTests/ActivatedSubjectTests.cs @@ -53,18 +53,6 @@ namespace Perspex.Styling.UnitTests Assert.NotNull(source.Error); } - private class Class1 : PerspexObject - { - public static readonly StyledProperty FooProperty = - PerspexProperty.Register("Foo", "foodefault"); - - public string Foo - { - get { return GetValue(FooProperty); } - set { SetValue(FooProperty, value); } - } - } - private class TestSubject : ISubject { private IObserver _observer; diff --git a/tests/Perspex.Styling.UnitTests/StyleActivatorTests.cs b/tests/Perspex.Styling.UnitTests/StyleActivatorTests.cs index afd573dd9d..d78c71caa0 100644 --- a/tests/Perspex.Styling.UnitTests/StyleActivatorTests.cs +++ b/tests/Perspex.Styling.UnitTests/StyleActivatorTests.cs @@ -165,18 +165,5 @@ namespace Perspex.Styling.UnitTests Assert.True(completed); } - - private Recorded>[] OnNextValues(params bool[] values) - { - var result = new List>>(); - var time = 1; - - foreach (var value in values) - { - result.Add(new Recorded>(time, Notification.CreateOnNext(value))); - } - - return result.ToArray(); - } } }