Skip to content

Commit e87111f

Browse files
committed
Fix: Design issue for consoletextbox
1 parent f27ddd3 commit e87111f

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

Source/NETworkManager/Resources/Styles/TextBoxStyles.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
<Style x:Key="ConsoleTextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
1919
<Setter Property="FontFamily" Value="Consolas" />
20-
<Setter Property="VerticalContentAlignment" Value="Top" />
2120
</Style>
2221

2322
<Style x:Key="SearchTextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource MahApps.Styles.TextBox.Search}">

Source/NETworkManager/Views/SNMPView.xaml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@
221221
</TextBlock>
222222
<TextBox Grid.Column="14" Grid.Row="2"
223223
x:Name="TextBoxUsername"
224+
VerticalAlignment="Stretch"
224225
mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}"
225226
IsReadOnly="{Binding IsRunning}">
226227
<TextBox.Style>
@@ -269,8 +270,10 @@
269270
</TextBlock.Style>
270271
</TextBlock>
271272
<ComboBox Grid.Column="2" Grid.Row="3"
273+
Height="{Binding ElementName=ComboBoxOid, Path=ActualHeight}"
272274
ItemsSource="{Binding AuthenticationProviders}"
273-
SelectedItem="{Binding AuthenticationProvider}" Margin="0,10,0,0">
275+
SelectedItem="{Binding AuthenticationProvider}"
276+
Margin="0,10,0,0">
274277
<ComboBox.Style>
275278
<Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource DefaultComboBox}">
276279
<Setter Property="Visibility" Value="Collapsed" />
@@ -407,18 +410,19 @@
407410
<Button Grid.Column="2"
408411
Command="{Binding WorkCommand}"
409412
IsDefault="{Binding IsRunning, Converter={StaticResource BooleanReverseConverter}}"
410-
IsCancel="{Binding IsRunning}"
411-
VerticalAlignment="Bottom">
413+
IsCancel="{Binding IsRunning}">
412414
<Button.Resources>
413415
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
414416
<Setter Property="IsDefault" Value="False" />
415417
<Setter Property="IsCancel" Value="False" />
416418
<Setter Property="IsEnabled" Value="False" />
417419
<Setter Property="Grid.Row" Value="1" />
420+
<Setter Property="VerticalAlignment" Value="Bottom" />
418421
<Style.Triggers>
419422
<DataTrigger Binding="{Binding Mode}" Value="Set">
420423
<Setter Property="Grid.Row" Value="5" />
421-
</DataTrigger>
424+
<Setter Property="VerticalAlignment" Value="Top" />
425+
</DataTrigger>
422426
<MultiDataTrigger>
423427
<MultiDataTrigger.Conditions>
424428
<Condition Binding="{Binding Version}" Value="v1" />
@@ -615,7 +619,7 @@
615619
</Style>
616620
</TextBlock.Style>
617621
</TextBlock>
618-
<controls:MultiSelectDataGrid Grid.Row="5" Grid.ColumnSpan="3" Grid.Column="0"
622+
<controls:MultiSelectDataGrid Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3"
619623
ItemsSource="{Binding ResultsView}"
620624
SelectedItem="{Binding SelectedResult}"
621625
Sorting="DataGrid_OnSorting"
@@ -690,7 +694,11 @@
690694
SortMemberPath="Data" MinWidth="300" />
691695
</DataGrid.Columns>
692696
</controls:MultiSelectDataGrid>
693-
<TextBox Grid.Row="5" Grid.Column="0" Text="{Binding Data}">
697+
<TextBox Grid.Row="5" Grid.Column="0"
698+
MinHeight="{Binding ElementName=ComboBoxOid, Path=ActualHeight}"
699+
VerticalAlignment="Top"
700+
TextWrapping="Wrap"
701+
Text="{Binding Data}">
694702
<TextBox.Style>
695703
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource ConsoleTextBox}">
696704
<Setter Property="Visibility" Value="Collapsed" />

Source/NETworkManager/Views/WhoisView.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,10 @@
130130
Style="{StaticResource HeaderTextBlock}"
131131
Text="{x:Static localization:Strings.Result}" />
132132
<TextBox Grid.Column="0" Grid.Row="1"
133-
VerticalScrollBarVisibility="Auto"
134-
Text="{Binding Result}"
133+
VerticalAlignment="Stretch"
134+
VerticalContentAlignment="Top"
135+
VerticalScrollBarVisibility="Auto"
136+
Text="{Binding Result}"
135137
IsReadOnly="True">
136138
<TextBox.Style>
137139
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource ConsoleTextBox}">

0 commit comments

Comments
 (0)