Mercurial > hg > toolkit / file diff

--- a/ui/wpf/UIcore/Controls.cs	Sun Jan 22 11:48:50 2017 +0100
+++ b/ui/wpf/UIcore/Controls.cs	Sun Jan 22 17:23:20 2017 +0100
@@ -10,37 +10,8 @@
 {  
     public class Controls
     {
-
         public static Button Button(Container container, String label, RoutedEventHandler e)
         {
-            return Application.GetInstance().Exec<Button>(() => Controls.CreateButton(container, label, e));
-        }
-
-        public static Label Label(Container container, String label, int alignment)
-        {
-            HorizontalAlignment a;
-            switch(alignment)
-            {
-                case 0: a = HorizontalAlignment.Left; break;
-                case 1: a = HorizontalAlignment.Right; break;
-                case 2: a = HorizontalAlignment.Center; break;
-                default: a = HorizontalAlignment.Left; break;
-            }
-            return Application.GetInstance().Exec<Label>(() => Controls.CreateLabel(container, label, a));
-        }
-
-        public static Label Space(Container container)
-        {
-            return Application.GetInstance().Exec<Label>(() => Controls.CreateLabel(container, null, HorizontalAlignment.Center));
-        }
-
-        public static Separator Separator(Container container)
-        {
-            return Application.GetInstance().Exec<Separator>(() => Controls.CreateSeparator(container));
-        }
-
-        public static Button CreateButton(Container container, String label, RoutedEventHandler e)
-        {
             Button button = new Button();
             button.Content = label;
             container.Add(button, false);
@@ -50,17 +21,31 @@
             return button;
         }
 
-        public static Label CreateLabel(Container container, String str, HorizontalAlignment alignment)
+        public static Label Label(Container container, String str, int alignment)
         {
+            HorizontalAlignment a;
+            switch (alignment)
+            {
+                case 0: a = HorizontalAlignment.Left; break;
+                case 1: a = HorizontalAlignment.Right; break;
+                case 2: a = HorizontalAlignment.Center; break;
+                default: a = HorizontalAlignment.Left; break;
+            }
+
             Label label = new Label();
-            label.HorizontalAlignment = alignment;
+            label.HorizontalAlignment = a;
             label.Content = str;
             container.Add(label, false);
 
             return label;
         }
 
-        public static Separator CreateSeparator(Container container)
+        public static Label Space(Container container)
+        {
+            return Label(container, null, 2);
+        }
+
+        public static Separator Separator(Container container)
         {
             Separator separator = new Separator();
             container.Add(separator, false);