diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-01-29 13:30:29 +0100 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-01-29 13:30:29 +0100 |
| commit | 0bf825fce6f1946034dbea6b1f7eb8d0dacdab8a (patch) | |
| tree | 57eb7d724b1269401fa50dbc5efd3c824baa86fa /src/GraphicObjects | |
| parent | d33bdad20192033b0da77c2c1a0f151108767041 (diff) | |
debug renaming, debug template loading not skipping template tag in templatedContainer
Diffstat (limited to 'src/GraphicObjects')
| -rw-r--r-- | src/GraphicObjects/GenericStack.cs | 10 | ||||
| -rw-r--r-- | src/GraphicObjects/TemplatedContainer.cs | 8 | ||||
| -rw-r--r-- | src/GraphicObjects/Window.cs | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/GenericStack.cs index ae98971c..968c76ac 100644 --- a/src/GraphicObjects/GenericStack.cs +++ b/src/GraphicObjects/GenericStack.cs @@ -10,6 +10,12 @@ namespace Crow {
public class GenericStack : Group
{
+ internal class Page
+ {
+ public byte[] bmp;
+ public int Size;
+ }
+
#region CTOR
public GenericStack()
: base()
@@ -87,13 +93,13 @@ namespace Crow foreach (GraphicObject c in Children.Where(ch=>ch.Visible)) {
c.Slot.X = d;
d += c.Slot.Width + Spacing;
- //c.RegisterForLayouting ((int)LayoutingType.Y);
+ c.RegisterForLayouting ((int)LayoutingType.Y);
}
} else {
foreach (GraphicObject c in Children.Where(ch=>ch.Visible)) {
c.Slot.Y = d;
d += c.Slot.Height + Spacing;
- //c.RegisterForLayouting ((int)LayoutingType.X);
+ c.RegisterForLayouting ((int)LayoutingType.X);
}
}
}
diff --git a/src/GraphicObjects/TemplatedContainer.cs b/src/GraphicObjects/TemplatedContainer.cs index 0bb11fc7..3003d486 100644 --- a/src/GraphicObjects/TemplatedContainer.cs +++ b/src/GraphicObjects/TemplatedContainer.cs @@ -76,8 +76,12 @@ namespace Crow if (!xr.IsStartElement ()) continue; - if (xr.Name == "Template") - continue; + + if (xr.Name == "Template"){ + xr.Skip (); + if (!xr.IsStartElement ()) + continue; + } Type t = Type.GetType ("Crow." + xr.Name); GraphicObject go = (GraphicObject)Activator.CreateInstance (t); diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs index 8e2724c4..50176d6f 100644 --- a/src/GraphicObjects/Window.cs +++ b/src/GraphicObjects/Window.cs @@ -29,7 +29,9 @@ namespace Crow Direction currentDirection = Direction.None; #region CTOR - public Window () : base() {} + public Window () : base() { + + } #endregion #region GraphicObject overrides |