Mercurial > hg > toolkit / file diff

--- a/ui/wpf/UIcore/Container.cs	Sun Jan 22 17:23:20 2017 +0100
+++ b/ui/wpf/UIcore/Container.cs	Sun Jan 22 18:02:45 2017 +0100
@@ -21,6 +21,7 @@
         public bool Hexpand { get; set; }
         public bool Vexpand { get; set; }
         public bool NewLine { get; set; }
+        public int GridWidth { get; set; }
 
         public Layout()
         {
@@ -43,6 +44,7 @@
             Hexpand = false;
             Vexpand = false;
             NewLine = false;
+            GridWidth = 1;
         }
     }
 
@@ -240,12 +242,19 @@
                 row.Height = new GridLength(1, GridUnitType.Star);
             }
 
+            int gridwidth = Layout.GridWidth;
+            if(gridwidth > 1)
+            {
+                gridwidth++;
+            }
+
             Grid.SetColumn(control, X);
             Grid.SetRow(control, Y);
+            Grid.SetColumnSpan(control, gridwidth);
             Children.Add(control);
 
             Layout.Reset();
-            X++;
+            X += gridwidth;
         }
     }
 }