Skip to content

Commit 425d1cd

Browse files
bitbeansbitbeans
committed
Switch to DockPanels
1 parent a295117 commit 425d1cd

1 file changed

Lines changed: 28 additions & 28 deletions

File tree

‎SimpleDnsCrypt/Views/MainView.xaml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
<TabItem Padding="10,2,10,2" Height="39" VerticalAlignment="Top" Tag="mainTab"
6060
Header="{lex:Loc Key=tabitem_mainmenu}">
6161
<TabItem.Content>
62-
<StackPanel Orientation="Vertical" Margin="0,10,0,0">
62+
<DockPanel Margin="0,10,0,0">
6363
<Border BorderThickness="1" Background="#198AB328" Padding="10,10" Margin="0,0,0,0"
64-
MinHeight="75"
64+
MinHeight="75" DockPanel.Dock="Top"
6565
IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
6666
<Border.BorderBrush>
6767
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
@@ -147,7 +147,7 @@
147147
</StackPanel>
148148
</Border>
149149
<Border BorderThickness="1" Background="#198AB328" Padding="10,10" Margin="0,14,0,0"
150-
MinHeight="75">
150+
MinHeight="75" DockPanel.Dock="Top">
151151
<Border.BorderBrush>
152152
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
153153
Opacity="0.4">
@@ -214,7 +214,7 @@
214214
</Grid>
215215
</StackPanel>
216216
</Border>
217-
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0"
217+
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0" DockPanel.Dock="Bottom"
218218
IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
219219
<Border.BorderBrush>
220220
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
@@ -303,14 +303,14 @@
303303
</ItemsControl>
304304
</StackPanel>
305305
</Border>
306-
</StackPanel>
306+
</DockPanel>
307307
</TabItem.Content>
308308
</TabItem>
309309
<TabItem Padding="10,2,10,2" Height="39" VerticalAlignment="Top" Tag="resolverTab"
310310
Header="{lex:Loc Key=tabitem_resolvers}">
311311
<TabItem.Content>
312-
<StackPanel Orientation="Vertical" Margin="0,10,0,0">
313-
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0"
312+
<DockPanel Margin="0,10,0,0">
313+
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0" DockPanel.Dock="Top"
314314
IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
315315
<Border.BorderBrush>
316316
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
@@ -358,7 +358,7 @@
358358
Margin="0,5,0,0" />
359359
</StackPanel>
360360
</Border>
361-
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0"
361+
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0" DockPanel.Dock="Bottom"
362362
IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
363363
<Border.BorderBrush>
364364
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
@@ -484,15 +484,15 @@
484484
</Grid>
485485
</StackPanel>
486486
</Border>
487-
</StackPanel>
487+
</DockPanel>
488488
</TabItem.Content>
489489
</TabItem>
490490
<TabItem Padding="10,2,10,2" Height="39" VerticalAlignment="Top" Tag="advancedSettingsTab"
491491
Header="{lex:Loc Key=tabitem_advanced_settings}"
492492
Visibility="{Binding SettingsViewModel.IsAdvancedSettingsTabVisible, Converter={StaticResource BoolToVisibilityCollapsedConverter}}">
493493
<TabItem.Content>
494-
<StackPanel Orientation="Vertical" Margin="0,10,0,0">
495-
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0"
494+
<DockPanel Margin="0,10,0,0">
495+
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0" DockPanel.Dock="Top"
496496
IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
497497
<Border.BorderBrush>
498498
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
@@ -675,7 +675,7 @@
675675
Style="{DynamicResource AccentedSquareButtonStyle}" Margin="0,15,5,5" />
676676
</StackPanel>
677677
</Border>
678-
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0"
678+
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0" DockPanel.Dock="Bottom"
679679
IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
680680
<Border.BorderBrush>
681681
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
@@ -737,16 +737,16 @@
737737
</Grid>
738738
</StackPanel>
739739
</Border>
740-
</StackPanel>
740+
</DockPanel>
741741
</TabItem.Content>
742742
</TabItem>
743743
<TabItem Padding="10,2,10,2" Height="39" VerticalAlignment="Top" Tag="queryLogTab"
744744
Header="{lex:Loc Key=tabitem_querylog}"
745745
Visibility="{Binding SettingsViewModel.IsQueryLogTabVisible, Converter={StaticResource BoolToVisibilityCollapsedConverter}}">
746746
<TabItem.Content>
747-
<StackPanel Orientation="Vertical" Margin="0,10,0,0">
747+
<DockPanel Margin="0,10,0,0">
748748
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,10,0,0"
749-
DataContext="{Binding QueryLogViewModel}">
749+
DataContext="{Binding QueryLogViewModel}" DockPanel.Dock="Top">
750750
<Border.BorderBrush>
751751
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
752752
Opacity="0.4">
@@ -947,16 +947,16 @@
947947
</Grid>
948948
</StackPanel>
949949
</Border>
950-
</StackPanel>
950+
</DockPanel>
951951
</TabItem.Content>
952952
</TabItem>
953953
<TabItem Padding="10,2,10,2" Height="39" VerticalAlignment="Top" Tag="domainBlockLogTab"
954954
Visibility="{Binding SettingsViewModel.IsDomainBlockLogTabVisible, Converter={StaticResource BoolToVisibilityCollapsedConverter}}"
955955
Header="{lex:Loc Key=tabitem_domainblocklog}">
956956
<TabItem.Content>
957-
<StackPanel Orientation="Vertical" Margin="0,10,0,0">
957+
<DockPanel Margin="0,10,0,0">
958958
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,10,0,0"
959-
DataContext="{Binding DomainBlockLogViewModel}">
959+
DataContext="{Binding DomainBlockLogViewModel}" DockPanel.Dock="Top">
960960
<Border.BorderBrush>
961961
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
962962
Opacity="0.4">
@@ -1159,16 +1159,16 @@
11591159
</Grid>
11601160
</StackPanel>
11611161
</Border>
1162-
</StackPanel>
1162+
</DockPanel>
11631163
</TabItem.Content>
11641164
</TabItem>
11651165
<TabItem Padding="10,2,10,2" Height="39" VerticalAlignment="Top" Tag="addressBlockLogTab"
11661166
Visibility="{Binding SettingsViewModel.IsAddressBlockLogTabVisible, Converter={StaticResource BoolToVisibilityCollapsedConverter}}"
11671167
Header="{lex:Loc Key=tabitem_addressblocklog}">
11681168
<TabItem.Content>
1169-
<StackPanel Orientation="Vertical" Margin="0,10,0,0">
1169+
<DockPanel Margin="0,10,0,0">
11701170
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,10,0,0"
1171-
DataContext="{Binding AddressBlockLogViewModel}">
1171+
DataContext="{Binding AddressBlockLogViewModel}" DockPanel.Dock="Top">
11721172
<Border.BorderBrush>
11731173
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
11741174
Opacity="0.4">
@@ -1190,16 +1190,16 @@
11901190

11911191
</StackPanel>
11921192
</Border>
1193-
</StackPanel>
1193+
</DockPanel>
11941194
</TabItem.Content>
11951195
</TabItem>
11961196
<TabItem Padding="10,2,10,2" Height="39" VerticalAlignment="Top" Tag="domainBlacklistTab"
11971197
Visibility="{Binding SettingsViewModel.IsDomainBlacklistTabVisible, Converter={StaticResource BoolToVisibilityCollapsedConverter}}"
11981198
Header="{lex:Loc Key=tabitem_domainblacklist}">
11991199
<TabItem.Content>
1200-
<StackPanel Orientation="Vertical" Margin="0,10,0,0">
1200+
<DockPanel Margin="0,10,0,0">
12011201
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,10,0,0"
1202-
DataContext="{Binding DomainBlacklistViewModel}">
1202+
DataContext="{Binding DomainBlacklistViewModel}" DockPanel.Dock="Top">
12031203
<Border.BorderBrush>
12041204
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
12051205
Opacity="0.4">
@@ -1676,16 +1676,16 @@
16761676
</Grid>
16771677
</StackPanel>
16781678
</Border>
1679-
</StackPanel>
1679+
</DockPanel>
16801680
</TabItem.Content>
16811681
</TabItem>
16821682
<TabItem Padding="10,2,10,2" Height="39" VerticalAlignment="Top" Tag="addressBlacklistTab"
16831683
Visibility="{Binding SettingsViewModel.IsAddressBlacklistTabVisible, Converter={StaticResource BoolToVisibilityCollapsedConverter}}"
16841684
Header="{lex:Loc Key=tabitem_addressblacklist}">
16851685
<TabItem.Content>
1686-
<StackPanel Orientation="Vertical" Margin="0,10,0,0">
1686+
<DockPanel Margin="0,10,0,0">
16871687
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,10,0,0"
1688-
DataContext="{Binding AddressBlacklistViewModel}">
1688+
DataContext="{Binding AddressBlacklistViewModel}" DockPanel.Dock="Top">
16891689
<Border.BorderBrush>
16901690
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
16911691
Opacity="0.4">
@@ -1707,7 +1707,7 @@
17071707

17081708
</StackPanel>
17091709
</Border>
1710-
</StackPanel>
1710+
</DockPanel>
17111711
</TabItem.Content>
17121712
</TabItem>
17131713
</TabControl>

0 commit comments

Comments
 (0)