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

feat: 统一显示效果

Browse Source
This commit is contained in:
uye
2025-09-22 19:35:56 +08:00
parent aae995aef5
commit 56d796c92e
3 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/MaaWpfGui/Views/UserControl/ConfigurationMgrUserControl.xaml
View File

@@ -16,6 +16,7 @@
xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI"
xmlns:viewModels="clr-namespace:MaaWpfGui.ViewModels"
xmlns:vm="clr-namespace:MaaWpfGui"
d:Background="White"
d:DataContext="{d:DesignInstance {x:Type ui:SettingsViewModel}}"
d:DesignWidth="550"
mc:Ignorable="d">
@@ -29,6 +30,8 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
HorizontalContentAlignment="Stretch"
hc:TitleElement.HorizontalAlignment="Center"
hc:TitleElement.Title="{DynamicResource ConfigurationName}"
IsEditable="True"
IsHitTestVisible="{Binding Idle}"
IsReadOnly="True"
@@ -60,17 +63,11 @@
</ComboBox>
<Grid Width="250">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<controls:TextBlock
Grid.Column="0"
Margin="0,0,5,0"
hc:InfoElement.Placeholder="Default"
Text="{DynamicResource ConfigurationName}" />
<TextBox
Grid.Column="1"
Grid.Column="0"
Width="Auto"
hc:BorderElement.CornerRadius="4,0,0,4"
Text="{Binding NewConfigurationName, UpdateSourceTrigger=PropertyChanged}">
@@ -79,7 +76,7 @@
</TextBox.InputBindings>
</TextBox>
<Button
Grid.Column="2"
Grid.Column="1"
Width="60"
hc:BorderElement.CornerRadius="0,4,4,0"
BorderThickness="0,1,1,1"

17
src/MaaWpfGui/Views/UserControl/GuideUserControl.xaml
View File

@@ -91,12 +91,14 @@
Spacing="20">
<ComboBox
hc:InfoElement.Title="{Binding LanguageInfo, Mode=OneTime}"
hc:TitleElement.HorizontalAlignment="Center"
DisplayMemberPath="Display"
ItemsSource="{Binding LanguageList}"
SelectedValue="{Binding Language}"
SelectedValuePath="Value" />
<ComboBox
hc:InfoElement.Title="{DynamicResource UiTheme}"
hc:TitleElement.HorizontalAlignment="Center"
DisplayMemberPath="Display"
ItemsSource="{Binding DarkModeList}"
SelectedValue="{Binding DarkMode}"
@@ -114,6 +116,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
hc:InfoElement.Title="{DynamicResource ClientType}"
hc:TitleElement.HorizontalAlignment="Center"
DisplayMemberPath="Display"
ItemsSource="{Binding ClientTypeList}"
SelectedValue="{Binding ClientType}"
@@ -180,10 +183,7 @@
<StackPanel Margin="0,5" Visibility="{c:Binding !AutoDetectConnection}">
<StackPanel Margin="8,0,0,5" Orientation="Horizontal">
<controls:TextBlock Text="{DynamicResource ConnectionAddress}" />
<controls:TooltipBlock
HorizontalAlignment="Right"
VerticalAlignment="Top"
TooltipText="{DynamicResource ConnectionAddressTip}" />
<controls:TooltipBlock TooltipText="{DynamicResource ConnectionAddressTip}" />
</StackPanel>
<hc:ComboBox
HorizontalContentAlignment="Stretch"
@@ -345,21 +345,20 @@
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionMode="{Binding GuideTransitionMode}" Visibility="{c:Binding 'GuideStepIndex == 4'}">
<StackPanel
s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}"
DataContext="{Binding Source={x:Static ui:SettingsViewModel.PerformanceSettings}}">
<StackPanel s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}" DataContext="{Binding Source={x:Static ui:SettingsViewModel.PerformanceSettings}}">
<controls:TextBlock
Width="300"
MaxWidth="400"
Foreground="{DynamicResource InfoBrush}"
Text="{DynamicResource UseGpuForInferenceTip}"
TextWrapping="Wrap" />
<hc:ComboBox
Width="300"
Grid.Row="0"
Grid.Column="1"
Width="300"
Margin="5"
HorizontalAlignment="Stretch"
hc:InfoElement.Title="{DynamicResource UseGpuForInference}"
hc:TitleElement.HorizontalAlignment="Center"
Background="{DynamicResource RegionBrushOpacity25}"
ItemsSource="{Binding GpuOptions}"
PreviewMouseWheel="{s:Action DisableComboBoxScrollWhenClosed,

31
src/MaaWpfGui/Views/UserControl/Settings/PerformanceUserControl.xaml
View File

@@ -16,22 +16,18 @@
d:DataContext="{d:DesignInstance {x:Type viewModels:PerformanceUserControlModel}}"
d:DesignWidth="550"
mc:Ignorable="d">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<controls:TextBlock Margin="24,0,0,0" Text="{DynamicResource UseGpuForInference}" />
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<StackPanel
Margin="8,0,0,5"
HorizontalAlignment="Center"
Orientation="Horizontal">
<controls:TextBlock Text="{DynamicResource UseGpuForInference}" />
<controls:TooltipBlock TooltipText="{DynamicResource UseGpuForInferenceTip}" />
</StackPanel>
<hc:ComboBox
Grid.Row="0"
Grid.Column="1"
Width="240"
Margin="10,5"
Width="250"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="{DynamicResource RegionBrushOpacity25}"
@@ -53,12 +49,5 @@
</Style>
</hc:ComboBox.ItemContainerStyle>
</hc:ComboBox>
<CheckBox
Grid.Row="1"
Grid.Column="1"
Margin="10,5"
Content="{DynamicResource GpuAllowDeprecated}"
IsChecked="{Binding AllowDeprecatedGpu}"
IsEnabled="{Binding AllowDeprecatedGpu}" />
</Grid>
</StackPanel>
</UserControl>