diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-02-05 14:40:36 +0100 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-02-05 14:40:36 +0100 |
| commit | 829c71bc6ae4d92553627e1c0d21fc0147606e0e (patch) | |
| tree | 01656cf94ba3c911091dbd9d5fe778c8d346080d /src | |
| parent | 192851b638fc6bbd5b5ff4c2216cf3eed85defa4 (diff) | |
Revert "Merge branch 'GroupCacheEnableDisable'"
This reverts commit 016421c29b8daf86c273f919a4e3e13faefc5639, reversing
changes made to acfb21c78055c8294b885baba4756cb147c4c351.
Diffstat (limited to 'src')
| -rw-r--r-- | src/GraphicObjects/GraphicObject.cs | 13 | ||||
| -rw-r--r-- | src/GraphicObjects/Group.cs | 22 |
2 files changed, 5 insertions, 30 deletions
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index c0f9bab0..e181fdf7 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -79,7 +79,6 @@ namespace Crow HorizontalAlignment _horizontalAlignment = HorizontalAlignment.Center; Size _maximumSize = "0;0"; Size _minimumSize = "0;0"; - bool isRegisteredForRepaint = false; #endregion #region public fields @@ -460,16 +459,11 @@ namespace Crow //test if this speed up a lot to cancel clipping for an uncached group Group p = Parent as Group; if (p != null) { - if (p.bmp == null || !p.Caching) { - p.RegisterForRedraw (); + if (p.bmp == null) return; - } } - if (HostContainer == null || isRegisteredForRepaint) - return; - - HostContainer.gobjsToRedraw.Add (this); - isRegisteredForRepaint = true; + if (HostContainer != null) + HostContainer.gobjsToRedraw.Add (this); } /// <summary> @@ -491,7 +485,6 @@ namespace Crow //this clipping should take only last painted slots in ancestor tree which //is not the case for now. HostContainer.redrawClip.AddRectangle (ScreenCoordinates(LastPaintedSlot)); - isRegisteredForRepaint = false; } /// <summary> return size of content + margins </summary> protected virtual Size measureRawSize () diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs index 931ad334..14142e0d 100644 --- a/src/GraphicObjects/Group.cs +++ b/src/GraphicObjects/Group.cs @@ -27,14 +27,10 @@ namespace Crow internal int maxChildrenHeight = 0; bool _multiSelect = false; - bool _caching = false; List<GraphicObject> children = new List<GraphicObject>(); public GraphicObject activeWidget; - - - public virtual List<GraphicObject> Children { get { return children; } set { children = value; } @@ -43,23 +39,9 @@ namespace Crow public bool MultiSelect { get { return _multiSelect; } - set { - if (value == _multiSelect) - return; - _multiSelect = value; - NotifyValueChanged ("MultiSelect", _multiSelect); - } + set { _multiSelect = value; } } - [XmlAttributeAttribute()][DefaultValue(true)] - public bool Caching { - get { return _caching; } - set { - if (value == _caching) - return; - _caching = value; - NotifyValueChanged ("Caching", _multiSelect); - } - } + public virtual T addChild<T>(T child) { |