More tidying up

2024-06-27 21:00:33 +01:00
parent 3fd059618c
commit 9d05e96a05
7 changed files with 69 additions and 16 deletions
@@ -4,18 +4,29 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:vm="using:Wallet"
    x:DataType="vm:MaskedTextEntryViewModel"
-    Header="{Binding Key}">
+    Header="{Binding Key}"
+    IsExpanded="False">
+    <SettingsExpander.Resources>
+        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+    </SettingsExpander.Resources>
    <SettingsExpander.Footer>
        <MaskedTextBox Mask="{Binding Pattern}" Text="{Binding Value}">
            <TextBox.Styles>
                <Style Selector="TextBox.Write">
+                    <Setter Property="MaxWidth" Value="{Binding Width}" />
                    <Setter Property="MinWidth" Value="{Binding Width}" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlThemePadding}" />
+                    <Setter Property="TextWrapping" Value="NoWrap" />
                </Style>
                <Style Selector="TextBox.Read">
                    <Setter Property="MinWidth" Value="0" />
                    <Setter Property="IsReadOnly" Value="True" />
                    <Setter Property="BorderBrush" Value="Transparent" />
                    <Setter Property="Background" Value="Transparent" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" />
+                    <Setter Property="MinHeight" Value="0" />
+                    <Setter Property="TextWrapping" Value="Wrap" />
                    <Setter Property="Foreground">
                        <Setter.Value>
                            <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />