Browse Source

Removed some small diffs from master.

scenegraph-after-breakage
Steven Kirk 9 years ago
parent
commit
96f316eca6
  1. 2
      samples/interop/WindowsInteropTest/App.config
  2. 1
      src/Avalonia.Controls/TopLevel.cs
  3. 2
      src/Avalonia.Visuals/Media/GradientBrush.cs
  4. 2
      src/Avalonia.Visuals/Media/RadialGradientBrush.cs
  5. 6
      src/Gtk/Avalonia.Cairo/CairoPlatform.cs
  6. 7
      src/Gtk/Avalonia.Cairo/Media/Imaging/BitmapImpl.cs
  7. 1
      src/Gtk/Avalonia.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs
  8. 2
      src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
  9. 2
      tests/Avalonia.DesignerSupport.TestApp/App.config
  10. 1
      tests/Avalonia.LeakTests/ControlTests.cs
  11. 2
      tests/Avalonia.UnitTests/TestRoot.cs

2
samples/interop/WindowsInteropTest/App.config

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

1
src/Avalonia.Controls/TopLevel.cs

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

2
src/Avalonia.Visuals/Media/GradientBrush.cs

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

2
src/Avalonia.Visuals/Media/RadialGradientBrush.cs

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

6
src/Gtk/Avalonia.Cairo/CairoPlatform.cs

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

7
src/Gtk/Avalonia.Cairo/Media/Imaging/BitmapImpl.cs

@ -7,16 +7,17 @@ using Avalonia.Platform;
namespace Avalonia.Cairo.Media.Imaging namespace Avalonia.Cairo.Media.Imaging
{ {
using System.IO; 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")) :base(pixbuf.SaveToBuffer("png"))
{ {
} }
public int PixelWidth => Width; public int PixelWidth => Width;
public int PixelHeight => Height; public int PixelHeight => Height;
public void Save(string fileName) public void Save(string fileName)

1
src/Gtk/Avalonia.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs

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

2
src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs

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

2
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> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />

1
tests/Avalonia.LeakTests/ControlTests.cs

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

2
tests/Avalonia.UnitTests/TestRoot.cs

@ -42,7 +42,7 @@ namespace Avalonia.UnitTests
public int NameScopeUnregisteredSubscribers { get; private set; } 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; public Size MaxClientSize => Size.Infinity;

Loading…
Cancel
Save