diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-02-07 19:01:35 +0100 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-02-07 19:01:35 +0100 |
| commit | f1b44e126c22b642c274c971d3401e32c189fff2 (patch) | |
| tree | fd0bad1a38cf18bdbb117322b9c713a87e1f5f80 /src/GraphicObjects | |
| parent | 1890cb3f954423fb94bca94371333eae0991faa8 (diff) | |
String.Equals ordinal in bindings and color lookup, RegisterForLayouting in Visible change
Diffstat (limited to 'src/GraphicObjects')
| -rw-r--r-- | src/GraphicObjects/GraphicObject.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index 4ccef3a5..327d0d05 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -364,15 +364,17 @@ namespace Crow if (HostContainer == null) return; - //add slot to clipping to redraw - HostContainer.gobjsToRedraw.Add (this); +// //add slot to clipping to redraw +// HostContainer.gobjsToRedraw.Add (this); //ensure main win doesn't keep hidden childrens ref - if (this.Contains (HostContainer.hoverWidget)) + if (!_isVisible && this.Contains (HostContainer.hoverWidget)) HostContainer.hoverWidget = null; if (Parent is GenericStack) Parent.RegisterForLayouting (LayoutingType.Sizing | LayoutingType.PositionChildren); - +// + RegisterForLayouting(LayoutingType.Sizing); + RegisterForRedraw (); NotifyValueChanged ("Visible", _isVisible); } } @@ -908,7 +910,7 @@ namespace Crow } MethodInfo stringEquals = typeof(string).GetMethod - ("Compare", new Type[3] {typeof(string), typeof(string), typeof(StringComparison)}); + ("Equals", new Type[3] {typeof(string), typeof(string), typeof(StringComparison)}); Type sourceType = this.GetType(); EventInfo ei = typeof(IValueChange).GetEvent("ValueChanged"); MethodInfo evtInvoke = ei.EventHandlerType.GetMethod ("Invoke"); @@ -1013,7 +1015,7 @@ namespace Crow il.Emit (OpCodes.Ldstr, b.Expression.Split('/').LastOrDefault()); il.Emit (OpCodes.Ldc_I4_4);//StringComparison.Ordinal il.Emit (OpCodes.Callvirt, stringEquals); - il.Emit (OpCodes.Brfalse, jumpTable[i]); + il.Emit (OpCodes.Brtrue, jumpTable[i]); i++; } |