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

perf: 优化TaskQueue选中任务时设置按钮表现以突出当前选中的选项

Browse Source
This commit is contained in:
status102
2026-05-25 14:10:39 +08:00
parent 4f39102526
commit 5a2d0401e4
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaWpfGui/Res/Styles/Basic/Geometries.xaml
View File

@@ -71,4 +71,6 @@
<PathGeometry Figures="M 305 50 C 307.77 49.95 310.54 49.91 313.31 49.88 C 314.1 49.86 314.88 49.84 315.69 49.82 C 316.45 49.82 317.21 49.81 317.99 49.8 C 318.68 49.79 319.38 49.78 320.1 49.77 C 322 50 322 50 325 52 C 325.69 54.69 325.69 54.69 325 58 C 322.61 60.7 319.99 62.97 317 65 C 316.34 65 315.68 65 315 65 C 315 65.66 315 66.32 315 67 C 314.34 67 313.68 67 313 67 C 313 67.66 313 68.32 313 69 C 316.63 69 320.26 69 324 69 C 324.33 70.65 324.66 72.3 325 74 C 322.23 74.05 319.46 74.09 316.69 74.12 C 315.9 74.14 315.12 74.16 314.31 74.18 C 313.55 74.18 312.79 74.19 312.01 74.2 C 311.32 74.21 310.62 74.22 309.9 74.23 C 308 74 308 74 305 72 C 305.23 67.98 305.64 66.37 308.5 63.45 C 309.51 62.68 310.52 61.91 311.56 61.12 C 312.57 60.34 313.59 59.56 314.63 58.76 C 315.41 58.18 316.19 57.6 317 57 C 313.04 56.67 309.08 56.34 305 56 C 305 54.02 305 52.04 305 50 Z" />
<PathGeometry Figures="M 300 181 C 302.32 181.21 302.32 181.21 305 182 C 306.55 184.04 306.55 184.04 307.88 186.62 C 311.11 192.45 314.95 196.89 320.44 200.69 C 321.21 201.34 321.21 201.34 322 202 C 322 203.32 322 204.64 322 206 C 321.01 206.33 320.02 206.66 319 207 C 317.18 206.07 317.18 206.07 315.31 204.69 C 314.69 204.24 314.07 203.79 313.43 203.32 C 312.72 202.67 312.72 202.67 312 202 C 312 201.34 312 200.68 312 200 C 310.68 199.34 309.36 198.68 308 198 C 308 197.34 308 196.68 308 196 C 307.34 196 306.68 196 306 196 C 302.7 192.16 300.16 188.52 299.62 183.44 C 299.75 182.63 299.87 181.83 300 181 Z" />
</GeometryGroup>
<Geometry x:Key="ConfigGeometry2">M 827.904 541.184 a 278.592 278.592 0 0 0 0 -58.368 l 73.728 -58.368 c 15.872 -13.056 20.224 -35.584 9.728 -53.504 l -78.592 -137.728 c -9.984 -17.408 -31.232 -25.856 -51.712 -18.176 l -86.528 35.072 c -15.872 -11.52 -32.512 -21.248 -49.664 -29.184 l -12.8 -92.928 c -3.072 -20.224 -20.736 -35.584 -41.216 -35.584 h -157.44 c -20.736 0 -38.144 14.848 -41.216 35.84 L 378.88 221.44 c -17.152 7.936 -33.792 17.92 -49.664 29.184 L 242.688 215.296 c -18.688 -7.168 -41.216 0.768 -51.2 18.176 L 112.64 371.2 c -10.24 17.92 -6.144 40.448 10.24 53.76 l 73.472 58.112 c -1.024 9.472 -1.536 19.2 -1.536 29.184 c 0 9.728 0.512 19.456 1.536 29.184 l -73.984 58.368 c -15.872 13.056 -19.968 35.584 -9.728 53.248 l 78.848 137.728 c 9.984 17.408 32 25.856 51.456 17.92 l 86.528 -35.072 c 15.872 11.52 32.512 21.248 49.664 29.184 l 13.056 93.696 c 3.328 20.48 20.48 35.328 41.216 35.328 h 157.44 c 20.48 0 38.144 -15.36 41.216 -35.84 l 13.056 -93.184 c 17.152 -7.936 33.792 -17.664 49.664 -29.184 l 86.784 35.328 c 4.864 1.792 9.984 2.816 15.104 2.816 c 14.848 0 28.672 -7.936 36.096 -20.992 l 78.592 -137.728 c 10.24 -17.664 6.4 -40.192 -9.984 -53.76 l -73.472 -58.112 z M 512 642.816 C 440.832 642.816 382.72 584.192 382.72 512 S 440.832 381.184 512 381.184 S 641.28 439.808 641.28 512 S 583.424 642.816 512 642.816 Z</Geometry>
</ResourceDictionary>

33
src/MaaWpfGui/Views/UI/TaskQueueView.xaml
View File

@@ -158,7 +158,6 @@
Margin="0"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Right"
hc:IconElement.Geometry="{StaticResource ConfigGeometry}"
hc:VisualElement.HighlightBackground="Transparent"
hc:VisualElement.HighlightForeground="{DynamicResource PrimaryBrush}"
Background="Transparent"
@@ -168,6 +167,38 @@
GroupName="TaskSettings"
IsChecked="{Binding EnableSetting}"
Style="{DynamicResource RadioGroupItemSingle}">
<Grid Width="16" Height="16">
<Path Data="{StaticResource ConfigGeometry}" Stretch="Uniform">
<Path.Style>
<Style TargetType="Path">
<Setter Property="Fill" Value="{DynamicResource SecondaryTextBrush}" />
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=RadioButton}}" Value="True">
<Setter Property="Fill" Value="{DynamicResource PrimaryBrush}" />
</DataTrigger>
<DataTrigger Binding="{Binding EnableSetting}" Value="True">
<Setter Property="Visibility" Value="Collapsed" />
</DataTrigger>
</Style.Triggers>
</Style>
</Path.Style>
</Path>
<Path
Data="{StaticResource ConfigGeometry2}"
Fill="{DynamicResource PrimaryBrush}"
Stretch="Uniform">
<Path.Style>
<Style TargetType="Path">
<Setter Property="Visibility" Value="Collapsed" />
<Style.Triggers>
<DataTrigger Binding="{Binding EnableSetting}" Value="True">
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
</Style.Triggers>
</Style>
</Path.Style>
</Path>
</Grid>
<RadioButton.ToolTip>
<ToolTip>
<StackPanel>