|
221 | 221 | </TextBlock> |
222 | 222 | <TextBox Grid.Column="14" Grid.Row="2" |
223 | 223 | x:Name="TextBoxUsername" |
| 224 | + VerticalAlignment="Stretch" |
224 | 225 | mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}" |
225 | 226 | IsReadOnly="{Binding IsRunning}"> |
226 | 227 | <TextBox.Style> |
|
269 | 270 | </TextBlock.Style> |
270 | 271 | </TextBlock> |
271 | 272 | <ComboBox Grid.Column="2" Grid.Row="3" |
| 273 | + Height="{Binding ElementName=ComboBoxOid, Path=ActualHeight}" |
272 | 274 | ItemsSource="{Binding AuthenticationProviders}" |
273 | | - SelectedItem="{Binding AuthenticationProvider}" Margin="0,10,0,0"> |
| 275 | + SelectedItem="{Binding AuthenticationProvider}" |
| 276 | + Margin="0,10,0,0"> |
274 | 277 | <ComboBox.Style> |
275 | 278 | <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource DefaultComboBox}"> |
276 | 279 | <Setter Property="Visibility" Value="Collapsed" /> |
|
407 | 410 | <Button Grid.Column="2" |
408 | 411 | Command="{Binding WorkCommand}" |
409 | 412 | IsDefault="{Binding IsRunning, Converter={StaticResource BooleanReverseConverter}}" |
410 | | - IsCancel="{Binding IsRunning}" |
411 | | - VerticalAlignment="Bottom"> |
| 413 | + IsCancel="{Binding IsRunning}"> |
412 | 414 | <Button.Resources> |
413 | 415 | <Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}"> |
414 | 416 | <Setter Property="IsDefault" Value="False" /> |
415 | 417 | <Setter Property="IsCancel" Value="False" /> |
416 | 418 | <Setter Property="IsEnabled" Value="False" /> |
417 | 419 | <Setter Property="Grid.Row" Value="1" /> |
| 420 | + <Setter Property="VerticalAlignment" Value="Bottom" /> |
418 | 421 | <Style.Triggers> |
419 | 422 | <DataTrigger Binding="{Binding Mode}" Value="Set"> |
420 | 423 | <Setter Property="Grid.Row" Value="5" /> |
421 | | - </DataTrigger> |
| 424 | + <Setter Property="VerticalAlignment" Value="Top" /> |
| 425 | + </DataTrigger> |
422 | 426 | <MultiDataTrigger> |
423 | 427 | <MultiDataTrigger.Conditions> |
424 | 428 | <Condition Binding="{Binding Version}" Value="v1" /> |
|
615 | 619 | </Style> |
616 | 620 | </TextBlock.Style> |
617 | 621 | </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" |
619 | 623 | ItemsSource="{Binding ResultsView}" |
620 | 624 | SelectedItem="{Binding SelectedResult}" |
621 | 625 | Sorting="DataGrid_OnSorting" |
|
690 | 694 | SortMemberPath="Data" MinWidth="300" /> |
691 | 695 | </DataGrid.Columns> |
692 | 696 | </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}"> |
694 | 702 | <TextBox.Style> |
695 | 703 | <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource ConsoleTextBox}"> |
696 | 704 | <Setter Property="Visibility" Value="Collapsed" /> |
|
0 commit comments