From 4a9a7857e22131359627d47b6e2552836cac3340 Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Sun, 4 Sep 2016 18:41:04 +0200 Subject: Derive ListBox from TemplatedGroup Move Data List handling and selection in TemplatedGroup modifié : Templates/ComboBox.template modifié : Templates/ListBox.template modifié : Templates/ScrollingListBox.goml modifié : Templates/TreeView.template modifié : Templates/treeList.crow modifié : Tests/BasicTests.cs modifié : Tests/Interfaces/TemplatedContainer/testTreeView.crow modifié : Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow modifié : src/GraphicObjects/ListBox.cs modifié : src/GraphicObjects/MenuItem.cs modifié : src/GraphicObjects/TemplatedControl.cs modifié : src/GraphicObjects/TemplatedGroup.cs modifié : src/GraphicObjects/TreeView.cs modifié : src/IMLReader.cs modifié : src/ItemTemplate.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/GraphicObjects/TreeView.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/GraphicObjects/TreeView.cs') diff --git a/src/GraphicObjects/TreeView.cs b/src/GraphicObjects/TreeView.cs index ef228260..0cf2ce01 100644 --- a/src/GraphicObjects/TreeView.cs +++ b/src/GraphicObjects/TreeView.cs @@ -27,7 +27,7 @@ namespace Crow { //treeview expect expandable child (or not) //if their are expandable, some functions and events are added - public class TreeView : ListBox + public class TreeView : TemplatedGroup { GraphicObject selectedItemContainer = null; Color selBackground; -- cgit v1.3.1-4-g156e From 801c274f1d022f658176deefe2a6bc9e2c398613 Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Tue, 6 Sep 2016 13:42:33 +0200 Subject: remove selected item handling (moved into TemplatedGroup) modifié : src/GraphicObjects/TreeView.cs renames modifié : src/ItemTemplate.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/GraphicObjects/TreeView.cs | 29 +++-------------------------- src/ItemTemplate.cs | 7 ++++--- 2 files changed, 7 insertions(+), 29 deletions(-) (limited to 'src/GraphicObjects/TreeView.cs') 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); -- cgit v1.3.1-4-g156e