dan/Walleby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preview 3 lock

Browse Source
This commit is contained in:
TheXamlGuy
2024-07-06 22:59:33 +01:00
parent c0b166b970
commit 015af41fc8
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wallet.Avalonia/DateEntryView.axaml
+2
View File
@@ -7,6 +7,7 @@
Header="{Binding Key}" Header="{Binding Key}"
IsExpanded="False"> IsExpanded="False">
<SettingsExpander.Resources> <SettingsExpander.Resources>
<Thickness x:Key="TextControlMargin">0</Thickness>
<Thickness x:Key="TextControlCompactPadding">0</Thickness> <Thickness x:Key="TextControlCompactPadding">0</Thickness>
<Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness> <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
</SettingsExpander.Resources> </SettingsExpander.Resources>
@@ -24,6 +25,7 @@
</Style> </Style>
<Style Selector="DatePicker.Read"> <Style Selector="DatePicker.Read">
<Setter Property="MinWidth" Value="0" /> <Setter Property="MinWidth" Value="0" />
<Setter Property="MinHeight" Value="0" />
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</Style> </Style>
</DatePicker.Styles> </DatePicker.Styles>
Wallet.Avalonia/HyperlinkEntryView.axaml
+13 -5
View File
@@ -7,8 +7,10 @@
Header="{Binding Key}" Header="{Binding Key}"
IsExpanded="False"> IsExpanded="False">
<SettingsExpander.Resources> <SettingsExpander.Resources>
<Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness> <Thickness x:Key="TextControlMargin">0</Thickness>
<Thickness x:Key="TextControlCompactThemePadding">0</Thickness> <Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
<Thickness x:Key="TextControlCompactPadding">0</Thickness>
<Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
</SettingsExpander.Resources> </SettingsExpander.Resources>
<SettingsExpander.Action> <SettingsExpander.Action>
<ItemEntryActionView /> <ItemEntryActionView />
@@ -23,9 +25,14 @@
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
</Style> </Style>
<Style Selector="TextBox.Read"> <Style Selector="TextBox.Read">
<Setter Property="MaxWidth" Value="{Binding Width}" /> <Setter Property="MinWidth" Value="0" />
<Setter Property="MinWidth" Value="{Binding Width}" /> <Setter Property="IsReadOnly" Value="True" />
<Setter Property="IsVisible" Value="False" /> <Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="IsVisible" Value="True" />
<Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
<Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />
<Setter Property="MinHeight" Value="0" />
</Style> </Style>
</TextBox.Styles> </TextBox.Styles>
<Interaction.Behaviors> <Interaction.Behaviors>
@@ -53,6 +60,7 @@
</Style> </Style>
<Style Selector="HyperlinkButton.Read"> <Style Selector="HyperlinkButton.Read">
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
<Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
</Style> </Style>
</HyperlinkButton.Styles> </HyperlinkButton.Styles>
<Interaction.Behaviors> <Interaction.Behaviors>
Wallet.Avalonia/MaskedTextEntryView.axaml
+9 -5
View File
@@ -7,8 +7,10 @@
Header="{Binding Key}" Header="{Binding Key}"
IsExpanded="False"> IsExpanded="False">
<SettingsExpander.Resources> <SettingsExpander.Resources>
<Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness> <Thickness x:Key="TextControlMargin">0</Thickness>
<Thickness x:Key="TextControlCompactThemePadding">0</Thickness> <Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
<Thickness x:Key="TextControlCompactPadding">0</Thickness>
<Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
</SettingsExpander.Resources> </SettingsExpander.Resources>
<SettingsExpander.Action> <SettingsExpander.Action>
<ItemEntryActionView /> <ItemEntryActionView />
@@ -19,7 +21,8 @@
<Style Selector="TextBox.Write"> <Style Selector="TextBox.Write">
<Setter Property="MaxWidth" Value="{Binding Width}" /> <Setter Property="MaxWidth" Value="{Binding Width}" />
<Setter Property="MinWidth" Value="{Binding Width}" /> <Setter Property="MinWidth" Value="{Binding Width}" />
<Setter Property="Padding" Value="{StaticResource TextControlThemePadding}" /> <Setter Property="Margin" Value="{StaticResource TextControlMargin}" />
<Setter Property="Padding" Value="{StaticResource TextControlPadding}" />
<Setter Property="TextWrapping" Value="NoWrap" /> <Setter Property="TextWrapping" Value="NoWrap" />
</Style> </Style>
<Style Selector="TextBox.Read"> <Style Selector="TextBox.Read">
@@ -27,9 +30,10 @@
<Setter Property="IsReadOnly" Value="True" /> <Setter Property="IsReadOnly" Value="True" />
<Setter Property="BorderBrush" Value="Transparent" /> <Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" /> <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
<Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />
<Setter Property="MinHeight" Value="0" /> <Setter Property="MinHeight" Value="0" />
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="NoWrap" />
<Setter Property="Foreground"> <Setter Property="Foreground">
<Setter.Value> <Setter.Value>
<SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" /> <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
Wallet.Avalonia/PasswordEntryView.axaml
-2
View File
@@ -5,7 +5,6 @@
xmlns:v="using:Wallet.Avalonia" xmlns:v="using:Wallet.Avalonia"
xmlns:vm="using:Wallet" xmlns:vm="using:Wallet"
x:DataType="vm:PasswordEntryViewModel" x:DataType="vm:PasswordEntryViewModel"
Header="{Binding Key}" Header="{Binding Key}"
IsExpanded="False"> IsExpanded="False">
<SettingsExpander.Resources> <SettingsExpander.Resources>
@@ -40,7 +39,6 @@
<Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" /> <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
<Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" /> <Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />
<Setter Property="MinHeight" Value="0" /> <Setter Property="MinHeight" Value="0" />
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="Foreground"> <Setter Property="Foreground">
<Setter.Value> <Setter.Value>
<SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" /> <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
Wallet.Avalonia/TextEntryView.axaml
+1 -1
View File
@@ -33,7 +33,7 @@
<Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" /> <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
<Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" /> <Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />
<Setter Property="MinHeight" Value="0" /> <Setter Property="MinHeight" Value="0" />
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="NoWrap" />
<Setter Property="Foreground"> <Setter Property="Foreground">
<Setter.Value> <Setter.Value>
<SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" /> <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />