diff options
Diffstat (limited to 'src/GraphicObjects/Popper.cs')
| -rw-r--r-- | src/GraphicObjects/Popper.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs index 9f60aa40..175c99fd 100644 --- a/src/GraphicObjects/Popper.cs +++ b/src/GraphicObjects/Popper.cs @@ -39,7 +39,7 @@ namespace Crow bool _isPopped, _canPop; Alignment popDirection; - GraphicObject _content; + GraphicObject _contentContainer; Measure popWidth, popHeight; public event EventHandler Popped; @@ -111,22 +111,22 @@ namespace Crow #endregion public override GraphicObject Content { - get { return _content; } + get { return _contentContainer; } set { - if (_content != null) { - _content.LogicalParent = null; - _content.LayoutChanged -= _content_LayoutChanged; + if (_contentContainer != null) { + _contentContainer.LogicalParent = null; + _contentContainer.LayoutChanged -= _content_LayoutChanged; } - _content = value; + _contentContainer = value; - if (_content == null) + if (_contentContainer == null) return; - _content.LogicalParent = this; - _content.HorizontalAlignment = HorizontalAlignment.Left; - _content.VerticalAlignment = VerticalAlignment.Top; - _content.LayoutChanged += _content_LayoutChanged; + _contentContainer.LogicalParent = this; + _contentContainer.HorizontalAlignment = HorizontalAlignment.Left; + _contentContainer.VerticalAlignment = VerticalAlignment.Top; + _contentContainer.LayoutChanged += _content_LayoutChanged; } } void positionContent(LayoutingType lt){ @@ -242,9 +242,9 @@ namespace Crow protected override void Dispose (bool disposing) { - if (_content != null && disposing) { - if (_content.Parent == null) - _content.Dispose (); + if (_contentContainer != null && disposing) { + if (_contentContainer.Parent == null) + _contentContainer.Dispose (); } base.Dispose (disposing); } |