|
@@ -99,8 +99,8 @@
|
|
|
<Grid>
|
|
|
<Grid.ColumnDefinitions>
|
|
|
<ColumnDefinition MinWidth="300" Width="Auto"/>
|
|
|
- <ColumnDefinition/>
|
|
|
- <ColumnDefinition/>
|
|
|
+ <ColumnDefinition Width="Auto"/>
|
|
|
+ <ColumnDefinition MinWidth="200"/>
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
|
|
<Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1" Background="{DynamicResource Table_BG_Content}" Padding="5,1">
|
|
@@ -228,6 +228,7 @@
|
|
|
<Grid Grid.Column="2" Margin="5,0,0,0">
|
|
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
+ <ColumnDefinition Width="50"/>
|
|
|
<ColumnDefinition Width="auto"/>
|
|
|
<ColumnDefinition Width="auto"/>
|
|
|
<ColumnDefinition Width="*" />
|
|
@@ -236,7 +237,8 @@
|
|
|
<RowDefinition Height="auto"/>
|
|
|
<RowDefinition Height="auto"/>
|
|
|
</Grid.RowDefinitions>
|
|
|
- <TextBox x:Name="SearchTextBox" Grid.Column="0" BorderBrush="{DynamicResource Table_BG_FirstTitle}" BorderThickness="1" Background="White" Width="370"
|
|
|
+ <TextBlock Grid.Column="0" VerticalAlignment="Center">search:</TextBlock>
|
|
|
+ <TextBox x:Name="SearchTextBox" Grid.Column="1" BorderBrush="{DynamicResource Table_BG_FirstTitle}" BorderThickness="1" Background="White" Width="370"
|
|
|
HorizontalAlignment="Stretch" HorizontalContentAlignment="Left" VerticalAlignment="Stretch" VerticalContentAlignment="Center" Height="25"
|
|
|
Text="{Binding SearchText ,Delay=0, Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
|
|
|
<i:Interaction.Triggers>
|
|
@@ -247,7 +249,7 @@
|
|
|
</TextBox>
|
|
|
<!--<Button Grid.Column="1" Content="Search" Width="80" Height="25" Margin="5,0,0,0" Command="{Binding SearchCommand}" CommandParameter="{Binding Path=Text, ElementName=SearchTextBox}"></Button>-->
|
|
|
|
|
|
- <Border Grid.Row="1" BorderBrush="{DynamicResource Table_BD}" BorderThickness="1" Background="{DynamicResource Table_BG_Content}" Padding="5,1" Visibility="{Binding SearchListBoxShow}">
|
|
|
+ <Border Grid.Column="1" Grid.Row="1" BorderBrush="{DynamicResource Table_BD}" BorderThickness="1" Background="{DynamicResource Table_BG_Content}" Padding="5,1" Visibility="{Binding SearchListBoxShow}">
|
|
|
<Grid>
|
|
|
<ListBox x:Name="PART_LIST_SEARCH" Margin="5" ItemsSource="{Binding SearchResultCollection}" Width="350"
|
|
|
VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling"
|
|
@@ -280,7 +282,7 @@
|
|
|
Placement="Bottom"
|
|
|
StaysOpen="True">
|
|
|
|
|
|
- <Border Grid.Row="1" BorderBrush="{DynamicResource Table_BD}" BorderThickness="1" Background="{DynamicResource Table_BG_Content}" Padding="5,1">
|
|
|
+ <Border Grid.Column="1" Grid.Row="1" BorderBrush="{DynamicResource Table_BD}" BorderThickness="1" Background="{DynamicResource Table_BG_Content}" Padding="5,1">
|
|
|
<ListBox x:Name="PART_LIST_SEARCH1" Margin="5" ItemsSource="{Binding SearchResultCollection}" Width="350"
|
|
|
VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling"
|
|
|
ScrollViewer.HorizontalScrollBarVisibility="Auto" MaxHeight="215">
|