fix jimmejardine#292 : using a Grid Filler a la ToggleButton, which d…

…idn't suffer from this issue. !@#$%^&* WPF
GerHobbelt · Jan 17, 2021 · 384e13b · 384e13b
1 parent ddbac8d
commit 384e13b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Utilities/GUI/AugmentedButton.xaml b/Utilities/GUI/AugmentedButton.xaml
@@ -3,11 +3,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local_gui="clr-namespace:Utilities.GUI"
     >
-    <DockPanel x:Name="ObjPanel" ScrollViewer.VerticalScrollBarVisibility="Disabled">
+    <DockPanel x:Name="ObjPanel"  Background="Transparent">
         <Grid x:Name="PanelPopupPanel" DockPanel.Dock="Right" Width="20" Margin="1,0,0,0" >
             <Image x:Name="ImagePopupIndicator" Width="8" Height="8"/>
         </Grid>
         <Image x:Name="ImageIcon" Width="32" Height="32" Visibility="Collapsed" />
-        <TextBlock x:Name="TextCaption" Visibility="Collapsed" TextWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,0" MinWidth="25" ></TextBlock>
+        <TextBlock x:Name="TextCaption" Visibility="Collapsed" TextWrapping="Wrap" Margin="5,0" MinWidth="25" />
+        <Grid Name="GridFiller" />
     </DockPanel>
 </Button>
diff --git a/Utilities/GUI/AugmentedButton.xaml.cs b/Utilities/GUI/AugmentedButton.xaml.cs
@@ -31,6 +31,9 @@ public AugmentedButton()
             HorizontalAlignment = HorizontalAlignment.Stretch;
             VerticalAlignment = VerticalAlignment.Stretch;
 
+            TextCaption.HorizontalAlignment = HorizontalAlignment.Stretch;
+            TextCaption.VerticalAlignment = VerticalAlignment.Stretch;
+
             RenderOptions.SetBitmapScalingMode(ImageIcon, BitmapScalingMode.HighQuality);
 
             IsEnabledChanged += AugmentedButton_IsEnabledChanged;
@@ -58,9 +61,9 @@ public AugmentedButton()
                 {
                     Caption = "Sample in DesignMode";
                 }
-                if (Icon == null || Icon.Width < 1 || Icon.Height < 1)
+                if (ImageIcon == null || ImageIcon.Source == null || ImageIcon.Width < 1 || ImageIcon.Height < 1)
                 {
-                    Icon = Icons.GetAppIcon(Icons.SaveAs);
+                    ImageIcon.Source = Icons.GetAppIcon(Icons.SaveAs);
                 }
             }
 #endif