调整样式

cdy816 · Aug 8, 2021 · c4928b8 · c4928b8
1 parent c2a18a0
commit c4928b8
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/Develop/Drivers/Cdy.Spider.CalculateDriver.Develop/Cdy.Spider.CalculateDriver.Develop.xml b/Develop/Drivers/Cdy.Spider.CalculateDriver.Develop/Cdy.Spider.CalculateDriver.Develop.xml
diff --git a/Develop/Drivers/Cdy.Spider.CalculateDriver.Develop/Themes/Generic.xaml b/Develop/Drivers/Cdy.Spider.CalculateDriver.Develop/Themes/Generic.xaml
@@ -12,15 +12,15 @@
     </DataTemplate>
 
     <DataTemplate DataType="{x:Type local:ScriptExpressConfigModel}">
-        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
+        <Grid HorizontalAlignment="Stretch"  VerticalAlignment="Stretch">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <TextBox x:Name="tb"  Foreground="{DynamicResource Window.Forground}" CaretBrush="{DynamicResource Window.Forground}"  Background="#1FFFFFFF" Text="{Binding Expresstion,Mode=TwoWay,UpdateSourceTrigger=LostFocus}"  BorderThickness="0,0,1,0" VerticalAlignment="Stretch" Margin="0,-1" Padding="3,2,0,0"/>
-            <Button Style="{DynamicResource ButtonStyle1}" Foreground="{DynamicResource Window.Forground}" BorderBrush="{DynamicResource Window.Forground}" BorderThickness="0"  Background="#1FFFFFFF" Content="..." HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Width="26" Command="{Binding ExpressionEditCommand}" />
-            <Button Style="{DynamicResource ButtonStyle1}" Foreground="Red" BorderBrush="{DynamicResource Window.Forground}" Margin="2,0,0,0" BorderThickness="1,0,0,0"  Background="#1FFFFFFF" Content="X" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Width="26" Command="{Binding ClearCommand}" />
+            <TextBox x:Name="tb"  Foreground="{DynamicResource Window.Forground}" CaretBrush="{DynamicResource Window.Forground}" AcceptsReturn="True" Background="#1FFFFFFF" Text="{Binding Expresstion,Mode=TwoWay,UpdateSourceTrigger=LostFocus}"  BorderThickness="0,0,1,0" VerticalAlignment="Stretch" Margin="0,-1" Padding="3,2,0,0"/>
+            <Button Style="{DynamicResource ButtonStyle1}" Foreground="{DynamicResource Window.Forground}" Margin="4,4,0,0" BorderBrush="{DynamicResource Window.Forground}" BorderThickness="1"  Background="#1FFFFFFF" Content="..."  HorizontalAlignment="Center" VerticalAlignment="Top" Grid.Column="1" Width="26" Command="{Binding ExpressionEditCommand}" />
+            <Button Style="{DynamicResource ButtonStyle1}" Foreground="Red" BorderBrush="{DynamicResource Window.Forground}" Margin="4,4,0,0" BorderThickness="1"  Background="#1FFFFFFF" Content="X" HorizontalAlignment="Center" VerticalAlignment="Top"  Grid.Column="2" Width="26" Command="{Binding ClearCommand}" />
         </Grid>
     </DataTemplate>
 </ResourceDictionary>
diff --git a/Develop/InSpiderDevelopWindow/View/DeviceDetailView.xaml b/Develop/InSpiderDevelopWindow/View/DeviceDetailView.xaml
@@ -229,12 +229,10 @@
                                             </Grid.ColumnDefinitions>
                                             <TextBox Background="Transparent" Padding="0" CaretBrush="White" BorderThickness="0" Foreground="{DynamicResource Window.Forground}" Margin="5,0" Text="{Binding ConvertString}" VerticalAlignment="Center" MinWidth="60" />
                                             <Button Grid.Column="1" Margin="4,0" Background="#1FFFFFFF" Foreground="{DynamicResource Window.Forground}" Content="..." VerticalAlignment="Center" VerticalContentAlignment="Top" Command="{Binding ConvertEditCommand}" Width="24" />
-                                            <Button Grid.Column="2" Margin="4,0" Command="{Binding ConvertRemoveCommand}" BorderThickness="0"  Background="Transparent" >
+                                            <Button Grid.Column="2" Margin="4,0" VerticalAlignment="Center" Width="24" Height="20" Command="{Binding ConvertRemoveCommand}" BorderThickness="1"  Background="#1FFFFFFF" >
                                                 <Button.ContentTemplate>
                                                     <DataTemplate>
-                                                        <StackPanel Orientation="Horizontal" Margin="0">
-                                                            <Image Source="/Image/close.png" Height="12" RenderOptions.BitmapScalingMode="NearestNeighbor" Margin="0,0,4,0"/>
-                                                        </StackPanel>
+                                                        <Image Source="/Image/close.png" Height="12" RenderOptions.BitmapScalingMode="NearestNeighbor" Margin="0,0,0,0"/>
                                                     </DataTemplate>
                                                 </Button.ContentTemplate>
                                             </Button>