Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Monospaced Embedded Font #2136

Merged
merged 7 commits into from Aug 26, 2019

Increase Font size and enforce Style's Font size definitions.

  • Loading branch information...
jmacato committed Aug 23, 2019
commit 23bc27ce99f74984b9b6f586bbd00f71afaefe1b
@@ -17,8 +17,12 @@
<UserControl.Styles>
<Style Selector="TextBlock">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
</Style>
<Style Selector="TextBox.Transaparent">
<Style Selector="TextBox">
<Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
</Style>
<Style Selector="TextBox.Transparent">
<Setter Property="Background" Value="Transparent" />
</Style>
</UserControl.Styles>
@@ -33,7 +37,7 @@
<ColumnDefinition Width="30" />
<ColumnDefinition Width="30" />
<ColumnDefinition SharedSizeGroup="A" Width="{Binding CoinJoinStatusWidth, Mode=OneWay}" />
<ColumnDefinition Width="130" />
<ColumnDefinition Width="140" />
<ColumnDefinition Width="100" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
@@ -86,21 +90,21 @@
<Expander Name="coinExpander" ExpandDirection="Down" Classes="coloredExpander" Background="{Binding ElementName=coinExpander, Path=IsExpanded, Converter={StaticResource CoinItemExpanderColorConverter}}">
<Grid HorizontalAlignment="Left" ColumnDefinitions="150, *" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" MaxWidth="800" Margin="35 10 0 25">
<TextBlock Classes="monospaceFont" Text="Transaction Id:" Grid.Row="0" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transaparent" Text="{Binding TransactionId}" Background="Transparent" Grid.Column="1" Grid.Row="0" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding TransactionId}" Background="Transparent" Grid.Column="1" Grid.Row="0" />
<TextBlock Classes="monospaceFont" Text="Output Index:" Grid.Row="1" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transaparent" Text="{Binding OutputIndex}" Grid.Column="1" Grid.Row="1" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding OutputIndex}" Grid.Column="1" Grid.Row="1" />
<TextBlock Classes="monospaceFont" Text="Label:" Grid.Row="2" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transaparent" Text="{Binding Label}" Grid.Column="1" Grid.Row="2" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Label}" Grid.Column="1" Grid.Row="2" />
<TextBlock Classes="monospaceFont" Text="Address:" Grid.Row="3" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transaparent" Text="{Binding Address}" Grid.Column="1" Grid.Row="3" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Address}" Grid.Column="1" Grid.Row="3" />
<TextBlock Classes="monospaceFont" Text="Confirmations:" Grid.Row="4" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transaparent" Text="{Binding Confirmations}" Grid.Column="1" Grid.Row="4" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Confirmations}" Grid.Column="1" Grid.Row="4" />
<TextBlock Classes="monospaceFont" Text="Anonymity Set:" Grid.Row="5" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transaparent" Text="{Binding AnonymitySet}" Grid.Column="1" Grid.Row="5" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding AnonymitySet}" Grid.Column="1" Grid.Row="5" />
<TextBlock Classes="monospaceFont" Text="Key Path:" Grid.Row="6" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transaparent" Text="{Binding KeyPath}" Grid.Column="1" Grid.Row="6" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding KeyPath}" Grid.Column="1" Grid.Row="6" />
<TextBlock Classes="monospaceFont" Text="Public Key:" Grid.Row="7" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transaparent" Text="{Binding PubKey}" Grid.Column="1" Grid.Row="7" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding PubKey}" Grid.Column="1" Grid.Row="7" />
</Grid>
</Expander>
<Grid Margin="30 0 0 0" VerticalAlignment="Top">
@@ -13,6 +13,11 @@
<converters:LurkingWifeModeStringConverter x:Key="LurkingWifeModeStringConverter" />
</UserControl.Resources>
<controls:GroupBox Title="{Binding Title}" TextBlock.FontSize="30" Padding="20" Margin="10">
<controls:GroupBox.Styles>
<Style Selector="TextBlock">
<Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
</Style>
</controls:GroupBox.Styles>
<Grid Classes="content">
<DockPanel LastChildFill="True">
<DockPanel LastChildFill="True" DockPanel.Dock="Bottom">
@@ -35,8 +40,8 @@
<Border Background="Transparent" IsVisible="{Binding Confirmed}" Grid.Column="0" ToolTip.Tip="{Binding Confirmations, StringFormat=\{0\} Confirmations}">
<Path HorizontalAlignment="Center" Data="F1 M 23.7501,33.25L 34.8334,44.3333L 52.2499,22.1668L 56.9999,26.9168L 34.8334,53.8333L 19.0001,38L 23.7501,33.25 Z" Fill="#22B14C" Height="16" Width="16" Stretch="Fill" />
</Border>
<TextBlock Text="{Binding DateTime, ConverterParameter=11, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="1" />
<TextBlock Text="{Binding AmountBtc, ConverterParameter=8, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="2" Foreground="{Binding AmountBtc, Converter={StaticResource MoneyBrushConverter}}" />
<TextBlock Classes="monospaceFont" Text="{Binding DateTime, ConverterParameter=11, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="1" />
<TextBlock Classes="monospaceFont" Text="{Binding AmountBtc, ConverterParameter=8, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="2" Foreground="{Binding AmountBtc, Converter={StaticResource MoneyBrushConverter}}" />
<TextBlock Classes="monospaceFont" IsVisible="{Binding !ClipboardNotificationVisible}" Text="{Binding TransactionId, ConverterParameter=50, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="3" />
<Grid IsVisible="{Binding ClipboardNotificationVisible}" Grid.Column="3">
<Grid Opacity="{Binding ClipboardNotificationOpacity}">
@@ -11,6 +11,14 @@
<converters:LurkingWifeModeStringConverter x:Key="LurkingWifeModeStringConverter" />
</UserControl.Resources>
<controls:GroupBox Title="{Binding Title}" TextBlock.FontSize="30" Padding="20" Margin="10">
<controls:GroupBox.Styles>
<Style Selector="TextBlock">
<Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
</Style>
<Style Selector="TextBox">
<Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
</Style>
</controls:GroupBox.Styles>
<Grid Classes="content">
<DockPanel LastChildFill="True">
<Grid RowDefinitions="Auto,*" DockPanel.Dock="Top">
@@ -94,9 +102,9 @@
</Panel>
<Grid ColumnDefinitions="140, *" RowDefinitions="22,22" Margin="6">
<TextBlock Classes="monospaceFont" Text="Public key:" Grid.Row="0" Grid.Column="0" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transaparent" Text="{Binding PubKey}" Grid.Row="0" Grid.Column="1" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding PubKey}" Grid.Row="0" Grid.Column="1" />
<TextBlock Classes="monospaceFont" Text="Key path:" Grid.Row="1" Grid.Column="0" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transaparent" Text="{Binding KeyPath}" Grid.Row="1" Grid.Column="1" />
<controls:ExtendedTextBox Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding KeyPath}" Grid.Row="1" Grid.Column="1" />
</Grid>
</StackPanel>
</Expander>
@@ -25,6 +25,9 @@
<Style Selector="ListBoxItem">
<Setter Property="Padding" Value="0 0 5 0" />
</Style>
<Style Selector="TextBox">
<Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
</Style>
</DockPanel.Styles>
<Grid Classes="content">
<DockPanel LastChildFill="True" Margin="20">
@@ -12,8 +12,8 @@
<SolidColorBrush x:Key="WarningMessageForeground">#FFDD00</SolidColorBrush>
<SolidColorBrush x:Key="GreenBrush">#00DD10</SolidColorBrush>
<sys:Double x:Key="FontSizeSmall">12</sys:Double>
<sys:Double x:Key="FontSizeNormal">14</sys:Double>
<sys:Double x:Key="FontSizeLarge">16</sys:Double>
<sys:Double x:Key="FontSizeNormal">16</sys:Double>
<sys:Double x:Key="FontSizeLarge">20</sys:Double>
<FontFamily x:Key="MonospacedFont">
<x:Arguments>
<x:String>Inconsolata</x:String>
@@ -82,7 +82,7 @@
</Style>
<Style Selector="TextBlock.monospaceFont">
<Setter Property="FontFamily" Value="{StaticResource MonospacedFont}"/>
</Style>
</Style>
This conversation was marked as resolved by jmacato

This comment has been minimized.

Copy link
@yahiheb

yahiheb Aug 23, 2019

Collaborator

Remove extra space.

<Style Selector="TextBox.selectableTextBlock">
<Setter Property="Padding" Value="0" />
<Setter Property="BorderThickness" Value="0" />
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.