From 801c274f1d022f658176deefe2a6bc9e2c398613 Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Tue, 6 Sep 2016 13:42:33 +0200 Subject: [PATCH] =?utf8?q?remove=20selected=20item=20handling=20(moved=20i?= =?utf8?q?nto=20TemplatedGroup)=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20?= =?utf8?q?=20=20=20src/GraphicObjects/TreeView.cs=20renames=20=09modifi?= =?utf8?q?=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20src/ItemTemplate.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/GraphicObjects/TreeView.cs | 29 +++-------------------------- src/ItemTemplate.cs | 7 ++++--- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/src/GraphicObjects/TreeView.cs b/src/GraphicObjects/TreeView.cs index 0cf2ce01..b9ab20b6 100644 --- a/src/GraphicObjects/TreeView.cs +++ b/src/GraphicObjects/TreeView.cs @@ -30,14 +30,14 @@ namespace Crow public class TreeView : TemplatedGroup { GraphicObject selectedItemContainer = null; - Color selBackground; - Color selForeground; bool isRoot; - + #region CTOR public TreeView () : base() { } + #endregion + [XmlAttributeAttribute()][DefaultValue(false)] public virtual bool IsRoot { get { return isRoot; } @@ -49,29 +49,6 @@ namespace Crow } } - [XmlAttributeAttribute][DefaultValue("SteelBlue")]//DeepJungleGreen - public virtual Color SelectionBackground { - get { return selBackground; } - set { - if (value == selBackground) - return; - selBackground = value; - NotifyValueChanged ("SelectionBackground", selBackground); - RegisterForRedraw (); - } - } - [XmlAttributeAttribute][DefaultValue("White")] - public virtual Color SelectionForeground { - get { return selForeground; } - set { - if (value == selForeground) - return; - selForeground = value; - NotifyValueChanged ("SelectionForeground", selForeground); - RegisterForRedraw (); - } - } - [XmlIgnore]public override object SelectedItem { get { return selectedItemContainer == null ? diff --git a/src/ItemTemplate.cs b/src/ItemTemplate.cs index f760ecee..310cfb0a 100644 --- a/src/ItemTemplate.cs +++ b/src/ItemTemplate.cs @@ -49,9 +49,10 @@ namespace Crow public void CreateExpandDelegate (TemplatedGroup host){ Type dataType = Type.GetType(strDataType); - Type hostType = typeof(TemplatedGroup);//not sure is the best place to put the dyn method + Type tmpGrpType = typeof(TemplatedGroup); + Type hostType = tmpGrpType;//not sure is the best place to put the dyn method Type evtType = typeof(EventHandler); - Type listBoxType = typeof(ListBox); + MethodInfo evtInvoke = evtType.GetMethod ("Invoke"); ParameterInfo [] evtParams = evtInvoke.GetParameters (); @@ -88,7 +89,7 @@ namespace Crow MethodInfo miGetDatas = dataType.GetMethod (fetchMethodName, new Type[] {}); il.Emit (OpCodes.Callvirt, miGetDatas); - il.Emit (OpCodes.Callvirt, listBoxType.GetProperty("Data").GetSetMethod ()); + il.Emit (OpCodes.Callvirt, tmpGrpType.GetProperty("Data").GetSetMethod ()); il.Emit (OpCodes.Ret); -- 2.47.3