From e878ab885138361617d47eca5cc7b9a986498ef6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Mon, 20 Nov 2017 21:55:34 +0100 Subject: [PATCH] IsDirty bug --- Crow.csproj | 1 - src/CompilerServices/MemberReference.cs | 82 ------------------------- src/Interface.cs | 2 +- 3 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 src/CompilerServices/MemberReference.cs diff --git a/Crow.csproj b/Crow.csproj index f6d78c1a..a78add0b 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -126,7 +126,6 @@ - diff --git a/src/CompilerServices/MemberReference.cs b/src/CompilerServices/MemberReference.cs deleted file mode 100644 index 372402a9..00000000 --- a/src/CompilerServices/MemberReference.cs +++ /dev/null @@ -1,82 +0,0 @@ -// -// MemberReference.cs -// -// Author: -// Jean-Philippe Bruyère -// -// Copyright (c) 2013-2017 Jean-Philippe Bruyère -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System; -using System.Linq; -using System.Reflection; - -namespace Crow -{ - /// - /// link MemberInfo and instance in one class - /// - public class MemberReference - { - public object Instance; - public MemberInfo Member; - - public PropertyInfo Property { get { return Member as PropertyInfo; } } - public FieldInfo Field { get { return Member as FieldInfo; } } - public EventInfo Event { get { return Member as EventInfo; } } - public MethodInfo Method { get { return Member as MethodInfo; } } - - #region CTOR - public MemberReference () {} - public MemberReference (object _instance, MemberInfo _member = null) - { - Instance = _instance; - Member = _member; - } - #endregion - - /// - /// Try to find member by name in instance class or, if not found, - /// in extension methods - /// - /// True if found, false otherwise - /// Member name to search for - public bool TryFindMember (string _memberName) - { - if (Instance == null) - return false; - Type t = Instance.GetType (); - Member = t.GetMember (_memberName, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance).FirstOrDefault (); - - #region search for extensions methods if member not found in type - if (Member == null && !string.IsNullOrEmpty (_memberName)) { - Assembly a = Assembly.GetExecutingAssembly (); - Member = CompilerServices.GetExtensionMethods (a, t).Where (em => em.Name == _memberName).FirstOrDefault (); - } - #endregion - - return Member != null; - } - public override string ToString () - { - return string.Format ("{0}.{1}", Instance, Member); - } - } -} - diff --git a/src/Interface.cs b/src/Interface.cs index 53d90ea5..19f4a889 100644 --- a/src/Interface.cs +++ b/src/Interface.cs @@ -534,11 +534,11 @@ namespace Crow lock (RenderMutex) { // Array.Copy (bmp, dirtyBmp, bmp.Length); - IsDirty = true; if (IsDirty) DirtyRect += clipping.Extents; else DirtyRect = clipping.Extents; + IsDirty = true; DirtyRect.Left = Math.Max (0, DirtyRect.Left); DirtyRect.Top = Math.Max (0, DirtyRect.Top); -- 2.47.3