fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-01 01:10:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 统一 SearchBar 样式

Browse Source
This commit is contained in:
uye
2026-06-05 00:30:05 +08:00
parent 204542620c
commit b396d0fb8c
3 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/MaaWpfGui/Res/Style.xaml
View File

@@ -1,22 +1,30 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<!-- 基础资源 -->
<ResourceDictionary Source="Styles/Basic/Geometries.xaml" />
<ResourceDictionary Source="Styles/Divider.xaml" />
<ResourceDictionary Source="Styles/ListBox.xaml" />
<ResourceDictionary Source="Styles/MdXaml.xaml" />
<ResourceDictionary Source="Styles/MessageBox.xaml" />
<ResourceDictionary Source="Styles/TextBlock.xaml" />
<ResourceDictionary Source="Styles/CongratulationsBrush.xaml" />
<ResourceDictionary Source="Styles/RainbowBrush.xaml" />
<!-- 按钮与交互控件 -->
<ResourceDictionary Source="Styles/Button.xaml" />
<ResourceDictionary Source="Styles/CheckBox.xaml" />
<ResourceDictionary Source="Styles/CheckComboBox.xaml" />
<ResourceDictionary Source="Styles/ComboBox.xaml" />
<ResourceDictionary Source="Styles/NumericUpDown.xaml" />
<ResourceDictionary Source="Styles/TextBox.xaml" />
<ResourceDictionary Source="Styles/CheckComboBox.xaml" />
<ResourceDictionary Source="Styles/DataGrid.xaml" />
<ResourceDictionary Source="Styles/PasswordBox.xaml" />
<ResourceDictionary Source="Styles/ToolTip.xaml" />
<ResourceDictionary Source="Styles/SearchBar.xaml" />
<ResourceDictionary Source="Styles/TextBox.xaml" />
<!-- 数据展示控件 -->
<ResourceDictionary Source="Styles/DataGrid.xaml" />
<ResourceDictionary Source="Styles/ListBox.xaml" />
<ResourceDictionary Source="Styles/TreeView.xaml" />
<ResourceDictionary Source="Styles/RainbowBrush.xaml" />
<ResourceDictionary Source="Styles/CongratulationsBrush.xaml" />
<!-- 文本与提示 -->
<ResourceDictionary Source="Styles/Divider.xaml" />
<ResourceDictionary Source="Styles/MessageBox.xaml" />
<ResourceDictionary Source="Styles/MdXaml.xaml" />
<ResourceDictionary Source="Styles/TextBlock.xaml" />
<ResourceDictionary Source="Styles/ToolTip.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

12
src/MaaWpfGui/Res/Styles/SearchBar.xaml Normal file
View File

@@ -0,0 +1,12 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls" xmlns:hc="https://handyorg.github.io/handycontrol">
<Style
x:Key="MaaSearchBarDefaultStyle"
BasedOn="{StaticResource SearchBarBaseStyle}"
TargetType="{x:Type hc:SearchBar}">
<Setter Property="Background" Value="{DynamicResource RegionBrushOpacity25}" />
</Style>
<Style BasedOn="{StaticResource MaaSearchBarDefaultStyle}" TargetType="{x:Type hc:SearchBar}" />
</ResourceDictionary>

5
src/MaaWpfGui/Views/Dialogs/AchievementListDialogView.xaml
View File

@@ -128,10 +128,9 @@
Margin="25,5"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="{DynamicResource MouseOverRegionBrushOpacity75}"
Command="{Binding SearchCmd, Source={x:Static helper:AchievementTrackerHelper.Instance}}"
CommandParameter="{Binding SearchText, Source={x:Static helper:AchievementTrackerHelper.Instance}}"
Text="{Binding SearchText, Source={x:Static helper:AchievementTrackerHelper.Instance}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
IsRealTime="True" />
IsRealTime="True"
Text="{Binding SearchText, Source={x:Static helper:AchievementTrackerHelper.Instance}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
</Grid>
</hc:Window>