From 5e9055d5d8a776a5fb5251fce990fa9804c5a2a3 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Thu, 25 Apr 2024 20:08:33 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=A0=87=E9=A2=98=E6=BB=9A=E5=8A=A8?=
=?UTF-8?q?=E5=8F=AF=E9=80=89=E5=BC=80=E5=90=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/MaaWpfGui/Constants/ConfigurationKeys.cs | 1 +
src/MaaWpfGui/Res/Localizations/en-us.xaml | 1 +
src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 1 +
src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 1 +
src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 1 +
src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 1 +
src/MaaWpfGui/ViewModels/UI/RootViewModel.cs | 11 +++++++++++
.../ViewModels/UI/SettingsViewModel.cs | 17 +++++++++++++++++
src/MaaWpfGui/Views/UI/RootView.xaml | 12 +++++++++++-
.../UserControl/GUISettingsUserControl.xaml | 8 +++++++-
10 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/MaaWpfGui/Constants/ConfigurationKeys.cs b/src/MaaWpfGui/Constants/ConfigurationKeys.cs
index d67bed493a..658518c93d 100644
--- a/src/MaaWpfGui/Constants/ConfigurationKeys.cs
+++ b/src/MaaWpfGui/Constants/ConfigurationKeys.cs
@@ -32,6 +32,7 @@ namespace MaaWpfGui.Constants
public const string Localization = "GUI.Localization";
public const string MinimizeToTray = "GUI.MinimizeToTray";
public const string HideCloseButton = "GUI.HideCloseButton";
+ public const string WindowTitleScrollable = "GUI.WindowTitleScrollable";
public const string UseLogItemDateFormat = "GUI.UseLogItemDateFormat";
public const string LogItemDateFormat = "GUI.LogItemDateFormatString";
public const string WindowPlacement = "GUI.Placement";
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 1d63dbad4a..74c3725b7c 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -301,6 +301,7 @@ Please do not check it when the stage OF-1 is not unlocked.
Hide to tray when minimized
System Notification
Hide close button
+ Window Title Scrolling
Custom log date format
Date format string
Restart immediately to apply changes?
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index dbc86f679e..32ddd042bd 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -302,6 +302,7 @@
最小化した際にトレイに表示
重要な通知をポップアップする
「閉じる」ボタンを隠す
+ タイトルのスクロール機能
カスタムログ日付形式
日付書式文字列
変更を適用するためにすぐに再起動しますか？
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 8151c044ee..663d0639b4 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -302,6 +302,7 @@ OF-1을 해금하지 않았다면 선택하지 말아 주세요.
트레이로 최소화
중요 알림 팝업
닫기 버튼 숨기기
+ 창 제목 스크롤
사용자 정의 로그 날짜 형식
날짜 형식 문자열
변경 사항을 적용을 위해 즉시 다시 시작하시겠습니까?
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 24bbd53a37..b144b7f753 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -301,6 +301,7 @@
最小化时隐藏至托盘
重要信息弹出系统通知
隐藏关闭按钮
+ 窗口标题滚动
自选日志日期格式
日期格式字符串
是否立刻重启应用更改？
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index 39c6fdec35..dfbf56cb74 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -301,6 +301,7 @@
最小化時隱藏至工作列
重要訊息彈出系統通知
隱藏關閉按鈕
+ 窗口標題滾動
自訂日誌日期格式
日期格式字串
是否立刻重啟應用更改？
diff --git a/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs b/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs
index 564039e81c..8731a41783 100644
--- a/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs
@@ -79,6 +79,17 @@ namespace MaaWpfGui.ViewModels.UI
set => SetAndNotify(ref _windowTitle, value);
}
+ private bool _windowTitleScrollable = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.WindowTitleScrollable, bool.FalseString));
+
+ ///
+ /// Gets or sets a value indicating whether to scroll the window title.
+ ///
+ public bool WindowTitleScrollable
+ {
+ get => _windowTitleScrollable;
+ set => SetAndNotify(ref _windowTitleScrollable, value);
+ }
+
private bool _showCloseButton = !Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.HideCloseButton, bool.FalseString));
///
diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
index bc2ae579d8..79092d2ee8 100644
--- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
@@ -3693,6 +3693,23 @@ namespace MaaWpfGui.ViewModels.UI
}
}
+ private bool _windowTitleScrollable = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.WindowTitleScrollable, bool.FalseString));
+
+ ///
+ /// Gets or sets a value indicating whether to make window title scrollable.
+ ///
+ public bool WindowTitleScrollable
+ {
+ get => _windowTitleScrollable;
+ set
+ {
+ SetAndNotify(ref _windowTitleScrollable, value);
+ ConfigurationHelper.SetValue(ConfigurationKeys.WindowTitleScrollable, value.ToString());
+ var rvm = (RootViewModel)this.Parent;
+ rvm.WindowTitleScrollable = value;
+ }
+ }
+
private bool _hideCloseButton = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.HideCloseButton, bool.FalseString));
///
diff --git a/src/MaaWpfGui/Views/UI/RootView.xaml b/src/MaaWpfGui/Views/UI/RootView.xaml
index 406f428772..e4281a9f3b 100644
--- a/src/MaaWpfGui/Views/UI/RootView.xaml
+++ b/src/MaaWpfGui/Views/UI/RootView.xaml
@@ -2,6 +2,8 @@
x:Class="MaaWpfGui.Views.UI.RootView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
+ xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:MaaWpfGui.Views.UI"
@@ -32,7 +34,15 @@
Content="{Binding WindowTitle}"
IsHitTestVisible="False"
Runaway="False"
- Speed="10" />
+ Speed="10"
+ Visibility="{c:Binding WindowTitleScrollable}" />
+