Skip to content

Commit

Permalink
Merge pull request #4272 from yahiheb/horizontal-scrollbar
Browse files Browse the repository at this point in the history 
Fix horizontal scroll bar issues
  • Loading branch information
danwalmsley committed Sep 2, 2020
2 parents 5aea8bc + 0d12e2d commit 737959f
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 40 deletions.
80 changes: 41 additions & 39 deletions WalletWasabi.Gui/Controls/WalletExplorer/CoinInfoTabView.xaml
View file
@@ -1,4 +1,4 @@
<UserControl xmlns="https://github.com/avaloniaui"
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
Expand All @@ -7,44 +7,46 @@
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.CoinInfoTabView">
<controls:GroupBox BorderThickness="0" Classes="docTabContainer">
<controls:GroupBox Title="Coin Details" TextBlock.FontSize="16" Padding="30" Margin="0 10 0 0">
<StackPanel DataContext="{Binding Coin}">
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Amount:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding AmountBtc}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Transaction Id:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding TransactionId}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Output Index:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding OutputIndex}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Address:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Address}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Confirmations:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Confirmations}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Anonymity Set:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding AnonymitySet}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Key Path:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding KeyPath}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Public Key:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding PubKey}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Known By:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Clusters}" />
</Grid>
</StackPanel>
<ScrollViewer HorizontalScrollBarVisibility="Auto">
<StackPanel DataContext="{Binding Coin}">
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Amount:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding AmountBtc}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Transaction Id:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding TransactionId}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Output Index:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding OutputIndex}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Address:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Address}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Confirmations:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Confirmations}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Anonymity Set:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding AnonymitySet}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Key Path:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding KeyPath}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Public Key:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding PubKey}" />
</Grid>
<Grid ColumnDefinitions="150, *">
<TextBlock Classes="monospaceFont" Text="Known By:" />
<controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Clusters}" />
</Grid>
</StackPanel>
</ScrollViewer>
</controls:GroupBox>
</controls:GroupBox>
</UserControl>
2 changes: 1 addition & 1 deletion WalletWasabi.Gui/Tabs/SettingsView.xaml
View file
Expand Up @@ -15,7 +15,7 @@
<TextBlock Text="Heads Up!" FontWeight="Bold" Classes="warningMessage" Margin="0 0 3 0" />
<TextBlock Classes="warningMessage">Changes will be applied after restarting the application.</TextBlock>
</StackPanel>
<ScrollViewer>
<ScrollViewer HorizontalScrollBarVisibility="Auto">
<StackPanel Margin="30" Spacing="10">
<Grid Classes="content">
<StackPanel Orientation="Vertical" Spacing="30">
Expand Down

0 comments on commit 737959f

Please sign in to comment.