Browse Source

Removed some small diffs from master.

Steven Kirk 8 years ago
parent
commit
96f316eca6

+ 1 - 1
samples/interop/WindowsInteropTest/App.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />

+ 0 - 1
src/Avalonia.Controls/TopLevel.cs

@@ -52,7 +52,6 @@ namespace Avalonia.Controls
         static TopLevel()
         {
             AffectsMeasure(ClientSizeProperty);
-            IsVisibleProperty.OverrideDefaultValue<TopLevel>(false);
         }
 
         /// <summary>

+ 0 - 2
src/Avalonia.Visuals/Media/GradientBrush.cs

@@ -51,7 +51,5 @@ namespace Avalonia.Media
             get { return GetValue(GradientStopsProperty); }
             set { SetValue(GradientStopsProperty, value); }
         }
-
-        IReadOnlyList<GradientStop> IGradientBrush.GradientStops => GradientStops;
     }
 }

+ 0 - 2
src/Avalonia.Visuals/Media/RadialGradientBrush.cs

@@ -1,8 +1,6 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using System;
-
 namespace Avalonia.Media
 {
     /// <summary>

+ 1 - 5
src/Gtk/Avalonia.Cairo/CairoPlatform.cs

@@ -34,11 +34,7 @@ namespace Avalonia.Cairo
 
         private static readonly Pango.Context s_pangoContext = CreatePangoContext();
 
-        public static void Initialize()
-        {
-            AvaloniaLocator.CurrentMutable
-                .Bind<IPlatformRenderInterface>().ToConstant(s_instance);
-        }
+        public static void Initialize() => AvaloniaLocator.CurrentMutable.Bind<IPlatformRenderInterface>().ToConstant(s_instance);
 
         public IBitmapImpl CreateBitmap(int width, int height)
         {

+ 4 - 3
src/Gtk/Avalonia.Cairo/Media/Imaging/BitmapImpl.cs

@@ -7,16 +7,17 @@ using Avalonia.Platform;
 namespace Avalonia.Cairo.Media.Imaging
 {
     using System.IO;
-    using Gdk;
+    using Cairo = global::Cairo;
 
-    public class BitmapImpl : Pixbuf, IBitmapImpl
+    public class BitmapImpl : Gdk.Pixbuf, IBitmapImpl
     {
-        public BitmapImpl(Pixbuf pixbuf)
+        public BitmapImpl(Gdk.Pixbuf pixbuf)
             :base(pixbuf.SaveToBuffer("png"))
         {
         }
 
         public int PixelWidth => Width;
+
         public int PixelHeight => Height;
 
         public void Save(string fileName)

+ 0 - 1
src/Gtk/Avalonia.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs

@@ -9,7 +9,6 @@ using Avalonia.Rendering;
 namespace Avalonia.Cairo.Media.Imaging
 {
     using System.IO;
-    using Gdk;
     using Cairo = global::Cairo;
 
     public class RenderTargetBitmapImpl : IRenderTargetBitmapImpl

+ 1 - 1
src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs

@@ -54,7 +54,7 @@ namespace Avalonia.Direct2D1.Media
             get { return _renderTarget.Transform.ToAvalonia(); }
             set { _renderTarget.Transform = value.ToDirect2D(); }
         }
-        
+
         /// <inheritdoc/>
         public void Clear(Color color)
         {

+ 1 - 1
tests/Avalonia.DesignerSupport.TestApp/App.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />

+ 1 - 0
tests/Avalonia.LeakTests/ControlTests.cs

@@ -307,6 +307,7 @@ namespace Avalonia.LeakTests
             }
         }
 
+
         [Fact]
         public void RendererIsDisposed()
         {

+ 1 - 1
tests/Avalonia.UnitTests/TestRoot.cs

@@ -42,7 +42,7 @@ namespace Avalonia.UnitTests
 
         public int NameScopeUnregisteredSubscribers { get; private set; }
 
-        public Size ClientSize { get; set;} = new Size(100, 100);
+        public Size ClientSize => new Size(100, 100);
 
         public Size MaxClientSize => Size.Infinity;