diff options
Diffstat (limited to 'src/GraphicObjects')
| -rw-r--r-- | src/GraphicObjects/GraphicObject.cs | 3 | ||||
| -rw-r--r-- | src/GraphicObjects/Label.cs | 2 | ||||
| -rw-r--r-- | src/GraphicObjects/ListBox.cs | 2 | ||||
| -rw-r--r-- | src/GraphicObjects/PrivateContainer.cs | 3 | ||||
| -rw-r--r-- | src/GraphicObjects/Scroller.cs | 2 | ||||
| -rw-r--r-- | src/GraphicObjects/TemplatedControl.cs | 6 |
6 files changed, 11 insertions, 7 deletions
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index 39556976..36be650d 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -1072,6 +1072,9 @@ namespace Crow public virtual void onKeyDown(object sender, KeyboardKeyEventArgs e){ KeyDown.Raise (sender, e); } + public virtual void onKeyUp(object sender, KeyboardKeyEventArgs e){ + KeyUp.Raise (sender, e); + } public virtual void onKeyPress(object sender, KeyPressEventArgs e){ KeyPress.Raise (sender, e); } diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs index d09542b5..95892314 100644 --- a/src/GraphicObjects/Label.cs +++ b/src/GraphicObjects/Label.cs @@ -72,7 +72,7 @@ namespace Crow protected TextExtents te; #endregion - [XmlAttributeAttribute][DefaultValue("SteelBlue")] + [XmlAttributeAttribute][DefaultValue("BlueGray")] public virtual Color SelectionBackground { get { return selBackground; } set { diff --git a/src/GraphicObjects/ListBox.cs b/src/GraphicObjects/ListBox.cs index 6cef4fd9..b92fe39f 100644 --- a/src/GraphicObjects/ListBox.cs +++ b/src/GraphicObjects/ListBox.cs @@ -172,7 +172,7 @@ namespace Crow itemStream = ItemTemplates ["default"]; lock (Interface.CurrentInterface.LayoutMutex) { - g = Interface.Load (itemStream); + g = itemStream.Instance; page.AddChild (g); g.DataSource = data [i]; } diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs index 93bae7fa..8793ba45 100644 --- a/src/GraphicObjects/PrivateContainer.cs +++ b/src/GraphicObjects/PrivateContainer.cs @@ -51,10 +51,11 @@ namespace Crow { if (child != null) { + child.ClearBinding (); contentSize = new Size (0, 0); child.LayoutChanged -= OnChildLayoutChanges; - this.RegisterForLayouting (LayoutingType.Sizing); child.Parent = null; + this.RegisterForGraphicUpdate (); } child = _child as GraphicObject; diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Scroller.cs index 0d57cdb3..3eaff5f4 100644 --- a/src/GraphicObjects/Scroller.cs +++ b/src/GraphicObjects/Scroller.cs @@ -39,7 +39,7 @@ namespace Crow public event EventHandler<ScrollingEventArgs> Scrolled; #region public properties - [XmlAttributeAttribute][DefaultValue(false)] + [XmlAttributeAttribute][DefaultValue(true)] public bool VerticalScrolling { get { return _verticalScrolling; } set { _verticalScrolling = value; } diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/TemplatedControl.cs index f1c719f6..9040ddeb 100644 --- a/src/GraphicObjects/TemplatedControl.cs +++ b/src/GraphicObjects/TemplatedControl.cs @@ -77,7 +77,7 @@ namespace Crow if (string.IsNullOrEmpty(_template)) loadTemplate (); else - loadTemplate (Interface.Load (_template, this)); + loadTemplate (Interface.Load (_template)); } } [XmlAttributeAttribute][DefaultValue("#Crow.Templates.ItemTemplate.goml")] @@ -116,7 +116,7 @@ namespace Crow { if (template == null) { DefaultTemplate dt = (DefaultTemplate)this.GetType ().GetCustomAttributes (typeof(DefaultTemplate), true).FirstOrDefault(); - this.SetChild (Interface.Load (dt.Path, this)); + this.SetChild (Interface.Load (dt.Path)); }else this.SetChild (template); @@ -184,7 +184,7 @@ namespace Crow } } } else - loadTemplate (Interface.Load (template, this)); + loadTemplate (Interface.Load (template)); //if no template found, load default one if (this.child == null) |