Improvements to flow containers and fixes for texture containers (#198)

RedpointArchive · Jun 4, 2017 · 0ce57e1 · 0ce57e1
1 parent 26fd9e5
commit 0ce57e1
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 8 deletions.
diff --git a/Protogame/UserInterface/Control/Container/FlowContainer.cs b/Protogame/UserInterface/Control/Container/FlowContainer.cs
@@ -100,7 +100,7 @@ public void SetChildSize(IContainer child, string size)
             _sizes.Insert(index, size);
         }
 
-        public void Update(ISkinLayout skinLayout, Rectangle layout, GameTime gameTime, ref bool stealFocus)
+        public virtual void Update(ISkinLayout skinLayout, Rectangle layout, GameTime gameTime, ref bool stealFocus)
         {
             foreach (var kv in ChildrenWithLayouts(layout))
             {
@@ -112,7 +112,7 @@ public void Update(ISkinLayout skinLayout, Rectangle layout, GameTime gameTime,
             }
         }
 
-        public bool HandleEvent(ISkinLayout skinLayout, Rectangle layout, IGameContext context, Event @event)
+        public virtual bool HandleEvent(ISkinLayout skinLayout, Rectangle layout, IGameContext context, Event @event)
         {
             foreach (var kv in ChildrenWithLayouts(layout))
             {
@@ -124,6 +124,27 @@ public bool HandleEvent(ISkinLayout skinLayout, Rectangle layout, IGameContext c
 
             return false;
         }
+
+        protected int? GetPureChildrenSize()
+        {
+            var acc = 0;
+            foreach (var s in _sizes)
+            {
+                if (s.EndsWith("%", StringComparison.Ordinal))
+                {
+                    return null;
+                }
+                else if (s == "*")
+                {
+                    return null;
+                }
+                else
+                {
+                    acc += Convert.ToInt32(s);
+                }
+            }
+            return acc;
+        }
 
         protected abstract Rectangle CreateChildLayout(Rectangle layout, int accumulated, int size);
 

diff --git a/Protogame/UserInterface/Control/Container/HorizontalContainer.cs b/Protogame/UserInterface/Control/Container/HorizontalContainer.cs
@@ -1,10 +1,21 @@
 namespace Protogame
 {
+    using System;
     using System.Linq;
     using Microsoft.Xna.Framework;
-    
-    public class HorizontalContainer : FlowContainer
+
+    public class HorizontalContainer : FlowContainer, IHasDesiredSize
     {
+        public int? GetDesiredHeight(ISkinLayout skin)
+        {
+            return null;
+        }
+
+        public int? GetDesiredWidth(ISkinLayout skin)
+        {
+            return GetPureChildrenSize();
+        }
+
         public override void Render(IRenderContext context, ISkinLayout skinLayout, ISkinDelegator skinDelegator, Rectangle layout)
         {
             skinDelegator.Render(context, layout, this);

diff --git a/Protogame/UserInterface/Control/Container/RawTextureContainer.cs b/Protogame/UserInterface/Control/Container/RawTextureContainer.cs
@@ -65,7 +65,7 @@ public void Render(IRenderContext context, ISkinLayout skinLayout, ISkinDelegato
                 case "stretch":
                 default:
                     // Nothing to do.
-                    return;
+                    break;
             }
 
             _renderUtilities.RenderTexture(

diff --git a/Protogame/UserInterface/Control/Container/TextureContainer.cs b/Protogame/UserInterface/Control/Container/TextureContainer.cs
@@ -64,7 +64,7 @@ public void Render(IRenderContext context, ISkinLayout skinLayout, ISkinDelegato
                 case "stretch":
                 default:
                     // Nothing to do.
-                    return;
+                    break;
             }
 
             _renderUtilities.RenderTexture(

diff --git a/Protogame/UserInterface/Control/Container/VerticalContainer.cs b/Protogame/UserInterface/Control/Container/VerticalContainer.cs
@@ -1,10 +1,21 @@
 namespace Protogame
 {
+    using System;
     using System.Linq;
     using Microsoft.Xna.Framework;
-    
-    public class VerticalContainer : FlowContainer
+
+    public class VerticalContainer : FlowContainer, IHasDesiredSize
     {
+        public int? GetDesiredHeight(ISkinLayout skin)
+        {
+            return GetPureChildrenSize();
+        }
+
+        public int? GetDesiredWidth(ISkinLayout skin)
+        {
+            return null;
+        }
+
         public override void Render(IRenderContext context, ISkinLayout skinLayout, ISkinDelegator skinDelegator, Rectangle layout)
         {
             skinDelegator.Render(context, layout, this);