From 9f16acbcc67d94c2fd7ff0628fec89325e158007 Mon Sep 17 00:00:00 2001 From: DanTheMan827 <790119+DanTheMan827@users.noreply.github.com> Date: Sat, 27 Apr 2019 00:32:53 -0500 Subject: [PATCH 1/2] Fix url encoded path and filenames on Mac #2475 --- native/Avalonia.Native/src/OSX/SystemDialogs.mm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/native/Avalonia.Native/src/OSX/SystemDialogs.mm b/native/Avalonia.Native/src/OSX/SystemDialogs.mm index 7049f77d20..567dd7f747 100644 --- a/native/Avalonia.Native/src/OSX/SystemDialogs.mm +++ b/native/Avalonia.Native/src/OSX/SystemDialogs.mm @@ -45,8 +45,7 @@ public: { auto url = [urls objectAtIndex:i]; - auto string = [url absoluteString]; - string = [string substringFromIndex:7]; + auto string = [url path]; strings[i] = (void*)[string UTF8String]; } @@ -137,8 +136,7 @@ public: { auto url = [urls objectAtIndex:i]; - auto string = [url absoluteString]; - string = [string substringFromIndex:7]; + auto string = [url path]; strings[i] = (void*)[string UTF8String]; } @@ -220,8 +218,7 @@ public: auto url = [panel URL]; - auto string = [url absoluteString]; - string = [string substringFromIndex:7]; + auto string = [url path]; strings[0] = (void*)[string UTF8String]; events->OnCompleted(1, &strings[0]); From d055e9e4b94b8a63d8b4da34396cae434606466d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Sat, 27 Apr 2019 23:57:52 +0100 Subject: [PATCH 2/2] Removed unused field. Removed unused usings. Whitespace cleanup. --- src/Avalonia.Visuals/Rendering/DeferredRenderer.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs index 5293e1b978..5d1c66f872 100644 --- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs +++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Threading; using Avalonia.Media; using Avalonia.Media.Immutable; using Avalonia.Platform; @@ -13,7 +12,6 @@ using Avalonia.Rendering.SceneGraph; using Avalonia.Threading; using Avalonia.Utilities; using Avalonia.VisualTree; -using System.Threading.Tasks; namespace Avalonia.Rendering { @@ -33,7 +31,6 @@ namespace Avalonia.Rendering private volatile IRef _scene; private DirtyVisuals _dirty; private IRef _overlay; - private object _rendering = new object(); private int _lastSceneId = -1; private DisplayDirtyRects _dirtyRectsDisplay = new DisplayDirtyRects(); private IRef _currentDraw; @@ -267,7 +264,7 @@ namespace Avalonia.Rendering RenderOverlay(scene.Item, GetContext()); if (updated || forceComposite || overlay) RenderComposite(scene.Item, GetContext()); - } + } } } finally @@ -321,15 +318,15 @@ namespace Avalonia.Rendering var (rs, _) = UpdateRenderLayersAndConsumeSceneIfNeeded(contextFactory, true); return (rs, true); } - + // Indicate that we have updated the layers return (sceneRef.Clone(), true); } - + // Just return scene, layers weren't updated return (sceneRef.Clone(), false); } - + } @@ -456,7 +453,7 @@ namespace Avalonia.Rendering private void RenderComposite(Scene scene, IDrawingContextImpl context) { context.Clear(Colors.Transparent); - + var clientRect = new Rect(scene.Size); foreach (var layer in scene.Layers)