make publi Initialize func of GraphicObj, test logical parent in popper to allow...

diff --git a/Default.style b/Default.style
index 62618b172a843e5a42b6d45d40ff23aab49f1079..5b39bc02eab3a4593fd918fd4905b6346f567277 100644 (file)
--- a/Default.style
+++ b/Default.style
@@ -23,6 +23,7 @@ Menu {
 }
 MenuItem {
        Width = Stretched;
+       Height = Fit;
        Background = Transparent;
        Foreground = LightGray;
        MouseEnter = {Background = vgradient|0:UnitedNationsBlue|1:Onyx;Foreground=White;}

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 574870f83e612e57804272afad99a505faeea9f1..f7e193e18a81437c0f6364d54e9129020a06861f 100644 (file)
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -23,7 +23,7 @@ namespace Crow
                        get {
                                if (currentInterface == null) {
                                        currentInterface = Interface.CurrentInterface;
-                                       initialize ();
+                                       Initialize ();
                                }
                                return currentInterface;
                        }
@@ -53,7 +53,13 @@ namespace Crow
                        #endif
                }
                #endregion
-               internal protected virtual void initialize(){
+
+               /// <summary>
+               /// Initialize this Graphic object instance by setting style and default values and loading template if required
+               /// </summary>
+               public virtual void Initialize(){
+                       if (currentInterface == null)
+                               currentInterface = Interface.CurrentInterface;
                        loadDefaultValues ();
                }
                #region private fields
@@ -513,7 +519,8 @@ namespace Crow
                                        LayoutChanged.Raise (this, new LayoutingEventArgs (LayoutingType.Width));
                                        Slot.Height = 0;
                                        LayoutChanged.Raise (this, new LayoutingEventArgs (LayoutingType.Height));
-                                       CurrentInterface.EnqueueForRepaint (this);
+                                       if (this.parent != null)
+                                               CurrentInterface.EnqueueForRepaint (this);
                                        LastSlots.Width = LastSlots.Height = 0;
                                }
 

diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs
index 8c79ce24f07ff60b99a47665c9f45719ede31733..0b022842bf09112c71f82a450563209b5f397240 100644 (file)
--- a/src/GraphicObjects/Popper.cs
+++ b/src/GraphicObjects/Popper.cs
@@ -229,6 +229,8 @@ namespace Crow
                                Content.Visible = true;
                                if (Content.Parent == null)
                                        CurrentInterface.AddWidget (Content, true);
+                               if (Content.LogicalParent != this)
+                                       Content.LogicalParent = this;
                                CurrentInterface.PutOnTop (Content, true);
                                _content_LayoutChanged (this, new LayoutingEventArgs (LayoutingType.Sizing));
                        }

diff --git a/src/GraphicObjects/TemplatedContainer.cs b/src/GraphicObjects/TemplatedContainer.cs
index f4243588ac2565d5a562eda13b1febaf54074614..44f2ca7c3894918804551a91ec4b9c35120fb5bb 100644 (file)
--- a/src/GraphicObjects/TemplatedContainer.cs
+++ b/src/GraphicObjects/TemplatedContainer.cs
@@ -31,7 +31,7 @@ namespace Crow
                public TemplatedContainer () : base(){}
                #endregion
 
-               [XmlIgnore]public abstract GraphicObject Content{ get; set;}
+               [XmlAttributeAttribute]public virtual GraphicObject Content{ get; set;}
 
                #region GraphicObject overrides
                public override GraphicObject FindByName (string nameToFind)

diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/TemplatedControl.cs
index 4a3a2507b92ca0286685109c1450524a3ec5b8ac..cd645dd37d082aa268e03621aecf48f8f9266f15 100644 (file)
--- a/src/GraphicObjects/TemplatedControl.cs
+++ b/src/GraphicObjects/TemplatedControl.cs
@@ -39,10 +39,10 @@ namespace Crow
                }
                #endregion
 
-               internal protected override void initialize ()
+               public override void Initialize ()
                {
                        loadTemplate ();
-                       base.initialize ();
+                       base.Initialize ();
                }
 
                string _template;

diff --git a/src/GraphicObjects/TemplatedGroup.cs b/src/GraphicObjects/TemplatedGroup.cs
index 4c35197f2fc40e4f80d7f6da9a7060ae06b021b3..fbb3c4bd3b3d166391eb437ab09f564cbdfbe822 100644 (file)
--- a/src/GraphicObjects/TemplatedGroup.cs
+++ b/src/GraphicObjects/TemplatedGroup.cs
@@ -330,7 +330,7 @@ namespace Crow
                        }else if (typeof(GenericStack).IsAssignableFrom (items.GetType ())) {
                                GenericStack gs = new GenericStack ();
                                gs.CurrentInterface = items.CurrentInterface;
-                               gs.initialize ();
+                               gs.Initialize ();
                                gs.Orientation = (items as GenericStack).Orientation;
                                gs.Width = items.Width;
                                gs.Height = items.Height;