Skip to content

Commit bfb7e58

Browse files
committed
调整开始、重置按钮样式
1 parent 09ed8bf commit bfb7e58

File tree

1 file changed

+46
-11
lines changed

1 file changed

+46
-11
lines changed

src/MainWindow.xaml

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,21 +161,56 @@
161161
</StackPanel>
162162
</Border>
163163
</Grid>
164-
<Grid Grid.Row="3" Margin="0,0,7,7">
165-
<StackPanel Orientation="Horizontal">
166-
<Button Name="BtnSearch" Click="BtnSearch_Click" Style="{StaticResource ChangeButtonIsMouseOver}" Background="Transparent" Foreground="{DynamicResource FontForeground}" FontWeight="Bold" FontSize="15" HorizontalAlignment="Center" Margin="95,0,0,0">
167-
<WrapPanel Width="80" Height="30" >
168-
<Image Name="ImgSearch" Width="24" Height="24" Source="{StaticResource ImgSearch}" Margin="10,5,0,0"></Image>
169-
<TextBlock Name="TxtSearch" Width="46" VerticalAlignment="Center" Text="查找"/>
164+
<Grid Grid.Row="3"
165+
Margin="0,0,7,7">
166+
<Grid>
167+
<Grid.ColumnDefinitions>
168+
<ColumnDefinition Width="auto" />
169+
<ColumnDefinition Width="*"/>
170+
<ColumnDefinition Width="auto" />
171+
</Grid.ColumnDefinitions>
172+
<Button
173+
Grid.Column="0"
174+
Name="BtnReset"
175+
Click="BtnReset_Click"
176+
Style="{StaticResource ChangeButtonIsMouseOver}"
177+
Background="Transparent"
178+
Foreground="{DynamicResource FontForeground}"
179+
FontWeight="Bold"
180+
FontSize="15">
181+
<WrapPanel>
182+
<Image
183+
Name="ImgReset"
184+
Width="24"
185+
Height="24"
186+
Source="{StaticResource ImgReset}" />
187+
<TextBlock
188+
VerticalAlignment="Center"
189+
Text="恢复默认配置"/>
170190
</WrapPanel>
171191
</Button>
172-
<Button Name="BtnReset" Click="BtnReset_Click" Style="{StaticResource ChangeButtonIsMouseOver}" Background="Transparent" Foreground="{DynamicResource FontForeground}" FontWeight="Bold" FontSize="15" HorizontalAlignment="Center" Margin="0,0,10,0">
173-
<WrapPanel Width="80" Height="30" >
174-
<Image Name="ImgReset" Width="24" Height="24" Source="{StaticResource ImgReset}" Margin="10,5,0,0"></Image>
175-
<TextBlock Width="46" VerticalAlignment="Center" Text="重置"/>
192+
<Button
193+
Grid.Column="2"
194+
Name="BtnSearch"
195+
Click="BtnSearch_Click"
196+
Style="{StaticResource ChangeButtonIsMouseOver}"
197+
Background="Transparent"
198+
Foreground="{DynamicResource FontForeground}"
199+
FontWeight="Bold"
200+
FontSize="15">
201+
<WrapPanel>
202+
<Image
203+
Name="ImgSearch"
204+
Width="24"
205+
Height="24"
206+
Source="{StaticResource ImgSearch}"/>
207+
<TextBlock
208+
Name="TxtSearch"
209+
VerticalAlignment="Center"
210+
Text="查找"/>
176211
</WrapPanel>
177212
</Button>
178-
</StackPanel>
213+
</Grid>
179214
</Grid>
180215
</Grid>
181216
<!-- 列表主面板 -->

0 commit comments

Comments
 (0)