diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-10-26 19:39:54 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-10-26 19:39:54 -0700 |
| commit | 300a951730a21d75b4800f12e8e23ca9473293ca (patch) | |
| tree | 37317dd10b482ed29d3d90dc896b38c575652e13 /windows | |
| parent | 095539de29563d23001a558141b2cec2487530a1 (diff) | |
| download | infinitytier-300a951730a21d75b4800f12e8e23ca9473293ca.tar.gz infinitytier-300a951730a21d75b4800f12e8e23ca9473293ca.zip | |
Figured out how to expand controls to fill parent. yay
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/WinUI/MainWindow.xaml | 10 | ||||
| -rw-r--r-- | windows/WinUI/MainWindow.xaml.cs | 1 | ||||
| -rw-r--r-- | windows/WinUI/NetworksPage.xaml | 2 | ||||
| -rw-r--r-- | windows/WinUI/PeersPage.xaml | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml index 83b75703..2dc8e40c 100644 --- a/windows/WinUI/MainWindow.xaml +++ b/windows/WinUI/MainWindow.xaml @@ -99,8 +99,14 @@ </Grid> </TabItem> <TabItem x:Name="Peers" Header="Peers" Background="#FF234447" Foreground="White"> - <Grid Background="#FFE5E5E5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> - <local:PeersPage x:Name="peersPage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"></local:PeersPage> + <Grid Background="#FFE5E5E5" HorizontalAlignment="Left" VerticalAlignment="Top"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="*"/> + </Grid.ColumnDefinitions> + <Grid.RowDefinitions> + <RowDefinition Height="*"/> + </Grid.RowDefinitions> + <local:PeersPage x:Name="peersPage" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.Row="0"/> </Grid> </TabItem> </TabControl> diff --git a/windows/WinUI/MainWindow.xaml.cs b/windows/WinUI/MainWindow.xaml.cs index e0aeca42..666a82e1 100644 --- a/windows/WinUI/MainWindow.xaml.cs +++ b/windows/WinUI/MainWindow.xaml.cs @@ -35,6 +35,7 @@ namespace WinUI updateStatus(); updateNetworks(); + updatePeers(); DataObject.AddPastingHandler(joinNetworkID, OnPaste); diff --git a/windows/WinUI/NetworksPage.xaml b/windows/WinUI/NetworksPage.xaml index 0dd87fbb..f8aec61b 100644 --- a/windows/WinUI/NetworksPage.xaml +++ b/windows/WinUI/NetworksPage.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300"> - <ScrollViewer x:Name="MyScrollViewer" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> + <ScrollViewer x:Name="MyScrollViewer" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=ActualWidth}" Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=ActualHeight}"> <WrapPanel x:Name="wrapPanel" Background="#FF555555" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> </WrapPanel> diff --git a/windows/WinUI/PeersPage.xaml b/windows/WinUI/PeersPage.xaml index 64c21132..ab498eea 100644 --- a/windows/WinUI/PeersPage.xaml +++ b/windows/WinUI/PeersPage.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" Background="White" Foreground="Black"> - <DataGrid x:Name="dataGrid" AutoGenerateColumns="False" CanUserResizeColumns="True" Margin="0,0,0,0" CanUserReorderColumns="False"> + <DataGrid x:Name="dataGrid" AutoGenerateColumns="False" CanUserResizeColumns="True" Margin="0,0,0,0" CanUserReorderColumns="False" Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=ActualWidth}" Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=ActualHeight}"> <DataGrid.Columns> <DataGridTextColumn Header="Address" Binding="{Binding Address}"/> <DataGridTextColumn Header="Version" Binding="{Binding VersionString}"/> |