Merge pull request #76 from ludocornut/master

Update FlexButton.xaml.cs
robinmanuelthiel · Jul 17, 2019 · 072e371 · 072e371
2 parents 1a0f33c + dbe3292
commit 072e371
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/Flex.Demo/FlexDemoPage.xaml b/Flex.Demo/FlexDemoPage.xaml
@@ -120,6 +120,7 @@
                 ClickedCommand="{Binding ButtonClickedCommand}"
                 IconOrientation="Right"
                 HorizontalOptions="Center"
+                Padding="0"
                 WidthRequest="300"
                 HeightRequest="76"
                 HasShadow="false"

diff --git a/Flex.Demo/FlexDemoPage.xaml.cs b/Flex.Demo/FlexDemoPage.xaml.cs
@@ -31,7 +31,18 @@ void ToggleIsEnabled_Clicked(object sender, EventArgs e)
 
         void ToggleIconOrientation_Clicked(object sender, EventArgs e)
         {
-            WideButton.IconOrientation = WideButton.IconOrientation == IconOrientation.Left ? IconOrientation.Right : IconOrientation.Left;
+            switch (WideButton.IconOrientation)
+            {
+                case IconOrientation.Left:
+                    WideButton.IconOrientation = IconOrientation.Right;
+                    break;
+                case IconOrientation.Right:
+                    WideButton.IconOrientation = IconOrientation.Top;
+                    break;
+                case IconOrientation.Top:
+                    WideButton.IconOrientation = IconOrientation.Left;
+                    break;
+            }            
         }
 
         public void ToggleHasShadow_Clicked(object sender, EventArgs e)

diff --git a/Flex/Controls/FlexButton.xaml.cs b/Flex/Controls/FlexButton.xaml.cs
@@ -362,6 +362,10 @@ void SetButtonMode()
                     // Configure Container
                     switch (IconOrientation)
                     {
+                        case IconOrientation.Top:
+                            ContainerContent.Direction = FlexDirection.Column;
+                            break;
+
                         case IconOrientation.Left:
                             ContainerContent.Direction = FlexDirection.Row;
                             break;
@@ -383,7 +387,12 @@ void SetButtonMode()
                     }
                     if (!userChangedIconPadding)
                     {
-                        IconPadding = IconOrientation == IconOrientation.Left ? new Thickness(0, 0, 6, 0) : new Thickness(6, 0, 0, 0);
+                        switch (IconOrientation)
+                        {
+                            case IconOrientation.Top: IconPadding = new Thickness(0, 0, 0, 6); break;
+                            case IconOrientation.Left: IconPadding = new Thickness(0, 0, 6, 0); break;
+                            case IconOrientation.Right: IconPadding = new Thickness(6, 0, 0, 0); break;
+                        }
                         userChangedIconPadding = false; // Set this back to false, as the above line triggers OnPropertyChanged 
                     }
 

diff --git a/Flex/Extensions/IconOrientation.cs b/Flex/Extensions/IconOrientation.cs
@@ -3,6 +3,7 @@
     public enum IconOrientation
     {
         Left,
-        Right
+        Right,
+        Top
     }
 }