Skip to content

Commit a184ba2

Browse files
committed
Optimize layout
1 parent 9f31811 commit a184ba2

File tree

4 files changed

+258
-251
lines changed

4 files changed

+258
-251
lines changed

IPConfig/Views/IPConfigDetailView.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
xmlns:lang="clr-namespace:IPConfig.Languages"
1010
xmlns:vm="clr-namespace:IPConfig.ViewModels"
1111
xmlns:v="clr-namespace:IPConfig.Views"
12+
xmlns:sys="clr-namespace:System;assembly=mscorlib"
1213
xmlns:hc="https://handyorg.github.io/handycontrol"
1314
d:DataContext="{d:DesignInstance Type=vm:IPConfigDetailViewModel,
1415
IsDesignTimeCreatable=True}"
@@ -44,7 +45,8 @@
4445
<Grid.RowDefinitions>
4546
<RowDefinition Height="Auto" />
4647
<RowDefinition Height="Auto"
47-
MaxHeight="{Binding ActualHeight, ElementName=iPv4ConfigView, Mode=OneTime}" />
48+
MaxHeight="{Binding ActualHeight, ElementName=iPv4ConfigView, Mode=OneTime}"
49+
d:MaxHeight="{x:Static sys:Double.PositiveInfinity}" />
4850
<RowDefinition Height="Auto" />
4951
<RowDefinition />
5052
</Grid.RowDefinitions>
@@ -94,7 +96,7 @@
9496
</Grid>
9597

9698
<hc:UniformSpacingPanel Grid.Row="1"
97-
Margin="0,3,0,0"
99+
Margin="0,4,0,0"
98100
HorizontalAlignment="Right"
99101
ItemHorizontalAlignment="Right"
100102
Spacing="4">

IPConfig/Views/IPConfigListView.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<UserControl x:Class="IPConfig.Views.IPConfigListView"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
43
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
74
xmlns:b="clr-namespace:IPConfig.Behaviors"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:dd="urn:gong-wpf-dragdrop"
7+
xmlns:hc="https://handyorg.github.io/handycontrol"
8+
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
89
xmlns:lang="clr-namespace:IPConfig.Languages"
910
xmlns:m="clr-namespace:IPConfig.Models"
11+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1012
xmlns:vm="clr-namespace:IPConfig.ViewModels"
11-
xmlns:hc="https://handyorg.github.io/handycontrol"
12-
xmlns:dd="urn:gong-wpf-dragdrop"
1313
d:DataContext="{d:DesignInstance Type=vm:IPConfigListViewModel,
1414
IsDesignTimeCreatable=True}"
1515
d:DesignHeight="450"
@@ -239,7 +239,7 @@
239239
</hc:Empty>
240240

241241
<UniformGrid Grid.Row="2"
242-
Height="36"
242+
Margin="0,4,0,0"
243243
Columns="2"
244244
Rows="1">
245245
<Button Padding="0"

0 commit comments

Comments
 (0)