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

Merge pull request #3702 from MaaAssistantArknights/CustomStyle/TextBlock

Browse Source 
chore: TextBlock使用自定义控件
This commit is contained in:
lhhxxxxx
2023-02-15 02:54:59 +08:00
committed by GitHub
parent ed6c3d4ee2 bba3bd9951
commit 21c02b5ba0
26 changed files with 199 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/MaaWpfGui/App.xaml
View File

@@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:s="https://github.com/canton7/Stylet">
<Application.Resources>
<!--<ResourceDictionary>
@@ -27,7 +28,7 @@
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml" />
</ResourceDictionary.MergedDictionaries>
<!-- A Style that affects all TextBlocks -->
<Style BasedOn="{StaticResource TextBlockDefault}" TargetType="TextBlock" />
<Style BasedOn="{StaticResource TextBlockDefault}" TargetType="maa:TextBlock" />
</ResourceDictionary>
</Application.Resources>
</Application>

34
src/MaaWpfGui/Helper/CustomStyle/TextBlock.cs Normal file
View File

@@ -0,0 +1,34 @@
// <copyright file="TextBlock.cs" company="MaaAssistantArknights">
// MaaWpfGui - A part of the MaaCoreArknights project
// Copyright (C) 2021 MistEO and Contributors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY
// </copyright>
using System.Windows;
using System.Windows.Media;
namespace MaaWpfGui.Helper.CustomStyle
{
public class TextBlock : System.Windows.Controls.TextBlock
{
static TextBlock()
{
DefaultStyleKeyProperty.OverrideMetadata(typeof(TextBlock), new FrameworkPropertyMetadata(typeof(TextBlock)));
}
public static readonly DependencyProperty CustomForegroundProperty = DependencyProperty.Register("CustomForeground", typeof(Brush), typeof(TextBlock), new PropertyMetadata(Brushes.Black));
public Brush CustomForeground
{
get { return (Brush)GetValue(CustomForegroundProperty); }
set { SetValue(CustomForegroundProperty, value); }
}
}
}

1
src/MaaWpfGui/MaaWpfGui.csproj
View File

@@ -103,6 +103,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Helper\CustomStyle\TextBlock.cs" />
<Compile Include="Helper\Utils.cs" />
<Compile Include="Helper\WebService.cs" />
<Compile Include="Helper\WindowManager.cs" />

1
src/MaaWpfGui/Main/VersionUpdateViewModel.cs
View File

@@ -42,7 +42,6 @@ namespace MaaWpfGui
/// Initializes a new instance of the <see cref="VersionUpdateViewModel"/> class.
/// </summary>
/// <param name="container">The IoC container.</param>
/// <param name="windowManager">The window manager.</param>
public VersionUpdateViewModel(IContainer container)
{
_settingsViewModel = container.Get<SettingsViewModel>();

13
src/MaaWpfGui/Views/CopilotView.xaml
View File

@@ -6,6 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -28,7 +29,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Top"
Orientation="Vertical">
<TextBlock
<maa:TextBlock
Margin="10"
Block.TextAlignment="Center"
Text="{DynamicResource CopilotLocation}" />
@@ -86,16 +87,16 @@
Content="{DynamicResource Stop}"
Visibility="{c:Binding !Idle}" />
</Grid>
<TextBlock Margin="5" Block.TextAlignment="Center">
<maa:TextBlock Margin="5" Block.TextAlignment="Center">
<Hyperlink Command="{s:Action Hyperlink_Click}" CommandParameter="{Binding Url}">
<TextBlock Text="{Binding Url}" />
</Hyperlink>
</TextBlock>
<TextBlock Margin="5" Block.TextAlignment="Center">
</maa:TextBlock>
<maa:TextBlock Margin="5" Block.TextAlignment="Center">
<Hyperlink Command="{s:Action Hyperlink_Click2}">
<TextBlock Text="{DynamicResource MapPrts}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
</StackPanel>
<ScrollViewer
@@ -109,7 +110,7 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Width="350"
Margin="5"
FontWeight="{Binding Weight}"

5
src/MaaWpfGui/Views/DepotView.xaml
View File

@@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -20,7 +21,7 @@
Margin="10,10,10,0"
VerticalAlignment="Top">
<StackPanel>
<TextBlock
<maa:TextBlock
Height="36"
Margin="10"
HorizontalAlignment="Left"
@@ -29,7 +30,7 @@
Style="{StaticResource TextBlockDefaultBold}"
Text="{Binding DepotInfo}"
TextWrapping="Wrap" />
<TextBlock
<maa:TextBlock
Margin="10"
HorizontalAlignment="Left"
FontSize="14"

15
src/MaaWpfGui/Views/ErrorView.xaml
View File

@@ -4,6 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="{DynamicResource UnknownErrorOccurs}"
Width="628"
@@ -20,7 +21,7 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
<maa:TextBlock
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="115,20,0,0"
@@ -43,7 +44,7 @@
Text="{DynamicResource UnknownErrorOccurs}"
TextWrapping="Wrap" />
<TextBlock
<maa:TextBlock
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="115,95,0,0"
@@ -66,7 +67,7 @@
Text="{DynamicResource UnknownErrorOccurs}"
TextWrapping="Wrap" />
<TextBlock
<maa:TextBlock
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="115,170,0,0"
@@ -89,7 +90,7 @@
Text="{DynamicResource UnknownErrorOccurs}"
TextWrapping="Wrap" />
<TextBlock
<maa:TextBlock
Grid.Column="0"
Grid.ColumnSpan="2"
Width="129"
@@ -104,9 +105,9 @@
NavigateUri="{Binding Source={x:Static local:MaaUrls.GitHubIssues}}">
<Run Text="{DynamicResource ErrorFeedbackLinkText}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
<TextBlock
<maa:TextBlock
x:Name="ErrorQqGroupLink"
Grid.Column="0"
Grid.ColumnSpan="2"
@@ -122,6 +123,6 @@
NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}}">
<Run Text="{DynamicResource ErrorQqGroupLinkText}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
</Grid>
</Window>

12
src/MaaWpfGui/Views/RecruitView.xaml
View File

@@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -20,7 +21,7 @@
Margin="10,10,10,0"
VerticalAlignment="Top">
<StackPanel>
<TextBlock
<maa:TextBlock
Height="36"
Margin="10"
HorizontalAlignment="Left"
@@ -29,7 +30,7 @@
Style="{StaticResource TextBlockDefaultBold}"
Text="{Binding RecruitInfo}"
TextWrapping="Wrap" />
<TextBlock
<maa:TextBlock
Margin="10"
HorizontalAlignment="Left"
FontSize="14"
@@ -44,14 +45,17 @@
VerticalAlignment="Center"
Orientation="Horizontal">
<StackPanel Margin="40,0,40,0" VerticalAlignment="Center">
<CheckBox Content="{DynamicResource AutoSettingTime}" IsChecked="{Binding AutoSetTime}" Margin="5"/>
<CheckBox
Margin="5"
Content="{DynamicResource AutoSettingTime}"
IsChecked="{Binding AutoSetTime}" />
<CheckBox
MaxWidth="170"
Margin="5"
HorizontalAlignment="Left"
IsChecked="{Binding IsLevel3UseShortTime}"
ToolTip="{DynamicResource Level3UseShortTimeTip}">
<TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
<maa:TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
</CheckBox>
</StackPanel>

1
src/MaaWpfGui/Views/RootView.xaml
View File

@@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"

27
src/MaaWpfGui/Views/SettingsView.xaml
View File

@@ -5,6 +5,7 @@
xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -38,7 +39,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -52,7 +53,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -66,7 +67,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -80,7 +81,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -94,7 +95,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -108,7 +109,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -122,7 +123,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -136,7 +137,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -147,7 +148,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -158,7 +159,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -169,7 +170,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -180,7 +181,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@@ -191,7 +192,7 @@
Height="1"
HorizontalAlignment="Stretch"
Fill="LightGray" />
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Center"

13
src/MaaWpfGui/Views/TaskQueueView.xaml
View File

@@ -7,6 +7,7 @@
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -58,8 +59,8 @@
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<!--<TextBlock Text="{Binding ID}" />
<TextBlock Text=". " />-->
<!--<maa:TextBlock Text="{Binding ID}" />
<maa:TextBlock Text=". " />-->
<CheckBox
Content="{Binding Name}"
IsChecked="{Binding IsChecked}"
@@ -116,7 +117,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock
<maa:TextBlock
Padding="5,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -171,7 +172,7 @@
Margin="10"
HorizontalAlignment="Center"
VerticalAlignment="Top" />
<TextBlock
<maa:TextBlock
Grid.Row="1"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
@@ -194,14 +195,14 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Width="95"
Margin="0,5"
VerticalAlignment="Top"
Foreground="Gray"
Text="{Binding Time}"
TextWrapping="Wrap" />
<TextBlock
<maa:TextBlock
Width="135"
Margin="0,5"
VerticalAlignment="Top"

29
src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml
View File

@@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -12,7 +13,7 @@
d:DesignWidth="550"
mc:Ignorable="d">
<StackPanel Margin="10" VerticalAlignment="Center">
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center">
@@ -23,9 +24,9 @@
TextDecorations="None">
<TextBlock Text="{DynamicResource Website}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center">
@@ -35,9 +36,9 @@
TextDecorations="None">
<TextBlock Text="{DynamicResource Github}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center">
@@ -48,9 +49,9 @@
TextDecorations="None">
<TextBlock Text="{DynamicResource QQgroup}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center">
@@ -60,9 +61,9 @@
TextDecorations="None">
<TextBlock Text="{DynamicResource QQchannel}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center">
@@ -72,9 +73,9 @@
TextDecorations="None">
<TextBlock Text="{DynamicResource Telegram}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center">
@@ -84,9 +85,9 @@
TextDecorations="None">
<TextBlock Text="{DynamicResource Help}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
<TextBlock
<maa:TextBlock
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center">
@@ -96,6 +97,6 @@
TextDecorations="None">
<TextBlock Text="{DynamicResource Issue}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
</StackPanel>
</UserControl>

5
src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml
View File

@@ -4,6 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -42,7 +43,7 @@
HorizontalAlignment="Left"
IsChecked="{Binding IsLevel3UseShortTime}"
ToolTip="{DynamicResource Level3UseShortTimeTip}">
<TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
<maa:TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
</CheckBox>
</StackPanel>
<StackPanel
@@ -50,7 +51,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Top"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Width="90"
Margin="5"
VerticalAlignment="Center"

9
src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
View File

@@ -5,6 +5,7 @@
xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -48,7 +49,7 @@
IsChecked="{Binding AlwaysAutoDetectConnection}"
Visibility="{c:Binding AutoDetectConnection}" />
</StackPanel>
<TextBlock
<maa:TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="10"
@@ -74,7 +75,7 @@
Content="{DynamicResource Select}"
IsEnabled="{c:Binding !AutoDetectConnection}" />
<TextBlock
<maa:TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="10"
@@ -93,7 +94,7 @@
Text="{Binding ConnectAddress, UpdateSourceTrigger=LostFocus}"
ToolTip="{DynamicResource ConnectionAddressTip}" />
<TextBlock
<maa:TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="10"
@@ -121,7 +122,7 @@
Content="{DynamicResource RetryOnDisconnected}"
IsChecked="{Binding RetryOnDisconnected}"
ToolTip="{DynamicResource RetryOnDisconnectedTip}" />
<TextBlock
<maa:TextBlock
Grid.Row="5"
Grid.Column="0"
VerticalAlignment="Center"

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

@@ -6,6 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -94,7 +95,7 @@
IsChecked="{Binding IsSpecifiedDrops}"
ToolTip="{DynamicResource NoAutoNavigation}" />
<Grid Height="42" Visibility="{c:Binding IsSpecifiedDrops}">
<TextBlock
<maa:TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
Text="{DynamicResource Quantity}"
@@ -136,7 +137,7 @@
</Grid.ColumnDefinitions>
<StackPanel Grid.Row="2" Orientation="Vertical">
<Grid Height="42">
<TextBlock
<maa:TextBlock
Margin="10,6"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -145,7 +146,7 @@
TextWrapping="Wrap" />
</Grid>
<Grid Height="42" Visibility="{c:Binding AlternateStageDisplay}">
<TextBlock
<maa:TextBlock
Margin="10,6"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -155,7 +156,7 @@
</Grid>
<Grid Height="42" Visibility="{c:Binding AlternateStageDisplay}">
<!-- a placeholder -->
<TextBlock
<maa:TextBlock
Margin="10,6"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -164,7 +165,7 @@
TextWrapping="Wrap" />
</Grid>
<Grid Height="42" Visibility="{c:Binding UseRemainingSanityStage}">
<TextBlock
<maa:TextBlock
Margin="10,6"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -248,7 +249,7 @@
</Grid.ColumnDefinitions>
<StackPanel Grid.Row="2" Orientation="Vertical">
<Grid Height="42">
<TextBlock
<maa:TextBlock
Margin="10,6"
HorizontalAlignment="Center"
VerticalAlignment="Center"

5
src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml
View File

@@ -6,6 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -33,7 +34,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="10"
Block.TextAlignment="Center"
Text="{DynamicResource MainViewButtonFeature}" />
@@ -50,7 +51,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="10"
Block.TextAlignment="Center"
Text="{DynamicResource Language}" />

3
src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
View File

@@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -15,7 +16,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Vertical">
<TextBlock
<maa:TextBlock
Margin="10,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"

5
src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml
View File

@@ -7,6 +7,7 @@
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -20,7 +21,7 @@
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="10"
Block.TextAlignment="Center"
Text="{DynamicResource HotKeyShowGui}" />
@@ -33,7 +34,7 @@
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="10"
Block.TextAlignment="Center"
Text="{DynamicResource HotKeyLinkStart}" />

21
src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml
View File

@@ -6,6 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -34,8 +35,8 @@
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<!--<TextBlock Text="{Binding ID}" />
<TextBlock Text=". " />-->
<!--<maa:TextBlock Text="{Binding ID}" />
<maa:TextBlock Text=". " />-->
<CheckBox Content="{Binding Name}" IsChecked="{Binding IsChecked}" />
</StackPanel>
</DataTemplate>
@@ -52,7 +53,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Vertical">
<TextBlock
<maa:TextBlock
Margin="0,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -70,7 +71,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Vertical">
<TextBlock
<maa:TextBlock
Margin="0,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -103,7 +104,7 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
IsChecked="{Binding DormFilterNotStationedEnabled}">
<TextBlock
<maa:TextBlock
MaxWidth="180"
Text="{DynamicResource DormFilterNotStationedEnabled}"
TextWrapping="Wrap" />
@@ -113,7 +114,7 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
IsChecked="{Binding OriginiumShardAutoReplenishment}">
<TextBlock
<maa:TextBlock
MaxWidth="180"
Text="{DynamicResource OriginiumShardAutoReplenishment}"
TextWrapping="Wrap" />
@@ -130,7 +131,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
IsChecked="{Binding CustomInfrastEnabled}">
<TextBlock
<maa:TextBlock
MaxWidth="180"
Text="{DynamicResource CustomInfrastEnabled}"
TextWrapping="Wrap" />
@@ -145,7 +146,7 @@
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock
<maa:TextBlock
Grid.Row="0"
Grid.Column="0"
HorizontalAlignment="Center"
@@ -158,7 +159,7 @@
ItemsSource="{Binding DefaultInfrastList}"
SelectedValue="{Binding DefaultInfrast}"
SelectedValuePath="Value" />
<TextBlock
<maa:TextBlock
Grid.Row="0"
Grid.Column="1"
Margin="5"
@@ -170,7 +171,7 @@
TextDecorations="None">
<TextBlock Text="{DynamicResource CustomInfrastGenerator}" />
</Hyperlink>
</TextBlock>
</maa:TextBlock>
<TextBox
Grid.Row="1"
Grid.Column="1"

5
src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
View File

@@ -4,6 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -52,7 +53,7 @@
VerticalAlignment="Top"
IsEnabled="{Binding CreditShopping}"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="10"
Block.TextAlignment="Center"
Text="{DynamicResource Blacklist}" />
@@ -67,7 +68,7 @@
VerticalAlignment="Top"
IsEnabled="{Binding CreditShopping}"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="10"
Block.TextAlignment="Center"
Text="{DynamicResource HighPriority}" />

3
src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml
View File

@@ -5,6 +5,7 @@
xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -66,7 +67,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="10"
Block.TextAlignment="Center"
Text="{DynamicResource PenguinID}" />

15
src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
View File

@@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -21,7 +22,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Top"
Orientation="Horizontal">
<TextBlock Margin="10" Text="{DynamicResource RoguelikeTheme}" />
<maa:TextBlock Margin="10" Text="{DynamicResource RoguelikeTheme}" />
<ComboBox
Width="110"
IsHitTestVisible="{Binding Idle}"
@@ -34,7 +35,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Top"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="10"
VerticalAlignment="Center"
Text="{DynamicResource Strategy}" />
@@ -50,7 +51,7 @@
</StackPanel>
<StackPanel HorizontalAlignment="Center">
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<TextBlock
<maa:TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
Text="{DynamicResource StartTimesLimit}"
@@ -72,7 +73,7 @@
Content="{DynamicResource InvestmentEnabled}"
IsChecked="{Binding RoguelikeInvestmentEnabled}" />
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<TextBlock
<maa:TextBlock
VerticalAlignment="Center"
Text="{DynamicResource GoldTimesLimit}"
TextWrapping="Wrap" />
@@ -103,7 +104,7 @@
HorizontalAlignment="Right"
VerticalAlignment="Top"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
HorizontalAlignment="Right"
VerticalAlignment="Center"
Block.TextAlignment="Right"
@@ -122,7 +123,7 @@
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
HorizontalAlignment="Right"
VerticalAlignment="Center"
Block.TextAlignment="Right"
@@ -140,7 +141,7 @@
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
MaxWidth="150"
HorizontalAlignment="Right"
VerticalAlignment="Center"

7
src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml
View File

@@ -5,6 +5,7 @@
xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -60,7 +61,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
VerticalAlignment="Center"
Block.TextAlignment="Center"
Text="{DynamicResource EmulatorPath}" />
@@ -76,7 +77,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock Block.TextAlignment="Center" Text="{DynamicResource AdditionCommand}" />
<maa:TextBlock Block.TextAlignment="Center" Text="{DynamicResource AdditionCommand}" />
</StackPanel>
<TextBox Margin="20,5" Text="{Binding EmulatorAddCommand}" />
</StackPanel>
@@ -85,7 +86,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="3"
Block.TextAlignment="Center"
Text="{DynamicResource WaitForEmulator}" />

81
src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml
View File

@@ -5,6 +5,7 @@
xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -32,13 +33,13 @@
Orientation="Horizontal">
<CheckBox Margin="10" IsChecked="{Binding TimerModels.Timers[0].IsOn}">
<CheckBox.Content>
<TextBlock>
<TextBlock.Text>
<maa:TextBlock>
<maa:TextBlock.Text>
<MultiBinding StringFormat="{}{0} 1">
<Binding Source="{StaticResource Timer}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</maa:TextBlock.Text>
</maa:TextBlock>
</CheckBox.Content>
</CheckBox>
<StackPanel Orientation="Horizontal">
@@ -49,7 +50,7 @@
IsReadOnly="{c:Binding !TimerModels.Timers[0].IsOn}"
Text="{Binding TimerModels.Timers[0].Hour, StringFormat=D2}"
TextWrapping="Wrap" />
<TextBlock Text=":" />
<maa:TextBlock Text=":" />
<TextBox
Width="35"
Margin="10"
@@ -68,13 +69,13 @@
Orientation="Horizontal">
<CheckBox Margin="10" IsChecked="{Binding TimerModels.Timers[1].IsOn}">
<CheckBox.Content>
<TextBlock>
<TextBlock.Text>
<maa:TextBlock>
<maa:TextBlock.Text>
<MultiBinding StringFormat="{}{0} 2">
<Binding Source="{StaticResource Timer}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</maa:TextBlock.Text>
</maa:TextBlock>
</CheckBox.Content>
</CheckBox>
<StackPanel Orientation="Horizontal">
@@ -85,7 +86,7 @@
IsReadOnly="{c:Binding !TimerModels.Timers[1].IsOn}"
Text="{Binding TimerModels.Timers[1].Hour, StringFormat=D2}"
TextWrapping="Wrap" />
<TextBlock Text=":" />
<maa:TextBlock Text=":" />
<TextBox
Width="35"
Margin="10"
@@ -104,13 +105,13 @@
Orientation="Horizontal">
<CheckBox Margin="10" IsChecked="{Binding TimerModels.Timers[2].IsOn}">
<CheckBox.Content>
<TextBlock>
<TextBlock.Text>
<maa:TextBlock>
<maa:TextBlock.Text>
<MultiBinding StringFormat="{}{0} 3">
<Binding Source="{StaticResource Timer}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</maa:TextBlock.Text>
</maa:TextBlock>
</CheckBox.Content>
</CheckBox>
<StackPanel Orientation="Horizontal">
@@ -121,7 +122,7 @@
IsReadOnly="{c:Binding !TimerModels.Timers[2].IsOn}"
Text="{Binding TimerModels.Timers[2].Hour, StringFormat=D2}"
TextWrapping="Wrap" />
<TextBlock Text=":" />
<maa:TextBlock Text=":" />
<TextBox
Width="35"
Margin="10"
@@ -140,13 +141,13 @@
Orientation="Horizontal">
<CheckBox Margin="10" IsChecked="{Binding TimerModels.Timers[3].IsOn}">
<CheckBox.Content>
<TextBlock>
<TextBlock.Text>
<maa:TextBlock>
<maa:TextBlock.Text>
<MultiBinding StringFormat="{}{0} 4">
<Binding Source="{StaticResource Timer}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</maa:TextBlock.Text>
</maa:TextBlock>
</CheckBox.Content>
</CheckBox>
<StackPanel Orientation="Horizontal">
@@ -157,7 +158,7 @@
IsReadOnly="{c:Binding !TimerModels.Timers[3].IsOn}"
Text="{Binding TimerModels.Timers[3].Hour, StringFormat=D2}"
TextWrapping="Wrap" />
<TextBlock Text=":" />
<maa:TextBlock Text=":" />
<TextBox
Width="35"
Margin="10"
@@ -176,13 +177,13 @@
Orientation="Horizontal">
<CheckBox Margin="10" IsChecked="{Binding TimerModels.Timers[4].IsOn}">
<CheckBox.Content>
<TextBlock>
<TextBlock.Text>
<maa:TextBlock>
<maa:TextBlock.Text>
<MultiBinding StringFormat="{}{0} 5">
<Binding Source="{StaticResource Timer}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</maa:TextBlock.Text>
</maa:TextBlock>
</CheckBox.Content>
</CheckBox>
<StackPanel Orientation="Horizontal">
@@ -193,7 +194,7 @@
IsReadOnly="{c:Binding !TimerModels.Timers[4].IsOn}"
Text="{Binding TimerModels.Timers[4].Hour, StringFormat=D2}"
TextWrapping="Wrap" />
<TextBlock Text=":" />
<maa:TextBlock Text=":" />
<TextBox
Width="35"
Margin="10"
@@ -212,13 +213,13 @@
Orientation="Horizontal">
<CheckBox Margin="10" IsChecked="{Binding TimerModels.Timers[5].IsOn}">
<CheckBox.Content>
<TextBlock>
<TextBlock.Text>
<maa:TextBlock>
<maa:TextBlock.Text>
<MultiBinding StringFormat="{}{0} 6">
<Binding Source="{StaticResource Timer}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</maa:TextBlock.Text>
</maa:TextBlock>
</CheckBox.Content>
</CheckBox>
<StackPanel Orientation="Horizontal">
@@ -229,7 +230,7 @@
IsReadOnly="{c:Binding !TimerModels.Timers[5].IsOn}"
Text="{Binding TimerModels.Timers[5].Hour, StringFormat=D2}"
TextWrapping="Wrap" />
<TextBlock Text=":" />
<maa:TextBlock Text=":" />
<TextBox
Width="35"
Margin="10"
@@ -248,13 +249,13 @@
Orientation="Horizontal">
<CheckBox Margin="10" IsChecked="{Binding TimerModels.Timers[6].IsOn}">
<CheckBox.Content>
<TextBlock>
<TextBlock.Text>
<maa:TextBlock>
<maa:TextBlock.Text>
<MultiBinding StringFormat="{}{0} 7">
<Binding Source="{StaticResource Timer}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</maa:TextBlock.Text>
</maa:TextBlock>
</CheckBox.Content>
</CheckBox>
<StackPanel Orientation="Horizontal">
@@ -265,7 +266,7 @@
IsReadOnly="{c:Binding !TimerModels.Timers[6].IsOn}"
Text="{Binding TimerModels.Timers[6].Hour, StringFormat=D2}"
TextWrapping="Wrap" />
<TextBlock Text=":" />
<maa:TextBlock Text=":" />
<TextBox
Width="35"
Margin="10"
@@ -284,13 +285,13 @@
Orientation="Horizontal">
<CheckBox Margin="10" IsChecked="{Binding TimerModels.Timers[7].IsOn}">
<CheckBox.Content>
<TextBlock>
<TextBlock.Text>
<maa:TextBlock>
<maa:TextBlock.Text>
<MultiBinding StringFormat="{}{0} 8">
<Binding Source="{StaticResource Timer}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</maa:TextBlock.Text>
</maa:TextBlock>
</CheckBox.Content>
</CheckBox>
<StackPanel Orientation="Horizontal">
@@ -301,7 +302,7 @@
IsReadOnly="{c:Binding !TimerModels.Timers[7].IsOn}"
Text="{Binding TimerModels.Timers[7].Hour, StringFormat=D2}"
TextWrapping="Wrap" />
<TextBlock Text=":" />
<maa:TextBlock Text=":" />
<TextBox
Width="35"
Margin="10"

7
src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
View File

@@ -5,6 +5,7 @@
xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
@@ -45,7 +46,7 @@
IsChecked="{Binding UseAria2}"
IsEnabled="{Binding UpdateCheck}" />
<StackPanel VerticalAlignment="Center" Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="10,10,0,10"
Block.TextAlignment="Center"
Text="{DynamicResource UpdateCheck}" />
@@ -73,7 +74,7 @@
<RowDefinition />
</Grid.RowDefinitions>
<TextBlock
<maa:TextBlock
Grid.Row="0"
Margin="1"
VerticalAlignment="Center"
@@ -85,7 +86,7 @@
VerticalAlignment="Center"
InputMethod.IsInputMethodEnabled="False"
Text="{Binding Proxy}" />
<TextBlock
<maa:TextBlock
Grid.Row="2"
Margin="10"
HorizontalAlignment="Center"

5
src/MaaWpfGui/Views/VersionUpdateView.xaml
View File

@@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml"
xmlns:s="https://github.com/canton7/Stylet"
@@ -23,13 +24,13 @@
Grid.Row="0"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<maa:TextBlock
Margin="0,20"
FontSize="24"
Style="{StaticResource TextBlockDefaultBold}"
Text="已更新："
TextWrapping="Wrap" />
<TextBlock
<maa:TextBlock
Margin="0,20"
FontSize="24"
Style="{StaticResource TextBlockDefaultBold}"