ShrlAlgo/Shrlalgo.RvKits
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复文字错误，和部分配色问题

Browse Source
This commit is contained in:
ShrlAlgo
2025-08-25 17:30:53 +08:00
parent f37062be60
commit ce4cc7bed0
56 changed files with 1370 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NeoUI/NeoUITest/App.xaml
View File

@@ -10,14 +10,12 @@
<ResourceDictionary.MergedDictionaries>
<!--<enu:ThemesDictionary Mode="Dark" Palette="Blue"/>
<enu:ControlsDictionary/>-->
<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/ColorPalette/LightBlue.xaml"/>
<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/Light.xaml" />
<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/ColorPalette/LightBlue.xaml"/>
<!--<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/ColorPalette/DarkBlue.xaml"/>
<ResourceDictionary Source="pack://application:,,,/NeuWPF;component/Themes/Dark.xaml" />-->
<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/Styles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>

2
NeoUI/NeoUITest/MainWindow.xaml
View File

@@ -988,7 +988,7 @@
</Calendar>
<Calendar IsEnabled="False">
<Calendar.BlackoutDates>
<CalendarDateRange End="2022/7/12" Start="2022/7/10" />
<CalendarDateRange End="2025/7/12" Start="2025/7/10" />
</Calendar.BlackoutDates>
</Calendar>
<n:TimePicker />

44
NeoUI/NeoUITest/MainWindow.xaml.cs
View File

@@ -1,8 +1,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
@@ -55,7 +57,28 @@ public partial class MainWindow
public ICommand ToggleDetailsCommand { get; set; }
[RelayCommand]
private void AddArea() { }
private void AddArea()
{
StringBuilder sb = new StringBuilder();
var dictionary = Application.Current.Resources;
foreach (var res in dictionary.MergedDictionaries)
{
foreach (DictionaryEntry item in res)
{
//sb.AppendLine($"{item.Key} = {item.Value}");
if (item.Key.ToString() == "TextPrimaryBrush")
{
MessageBox.Show($"TextPrimaryBrush:{item.Value}");
}
if (item.Key.ToString() == "TextPrimaryBrush")
{
MessageBox.Show($"TextSecondaryBrush:{item.Value}");
}
}
}
//输出到桌面
//System.IO.File.WriteAllText(System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "resources.txt"), sb.ToString());
}
#endregion
#region 静态数据
@@ -278,7 +301,7 @@ public partial class MainWindow
#region Modal 事件
private void ShowBasicModal_Click(object sender, RoutedEventArgs e)
{
bool? result = Modal.Confirm(this, "Basic Dialog", "This is a basic modal dialog.");
bool? result = Modal.Confirm(this, "默认对话框", "默认对话框");
if (result == true)
{
MessageBox.Show("User clicked OK!");
@@ -287,7 +310,7 @@ public partial class MainWindow
private async void ShowAsyncModal_Click(object sender, RoutedEventArgs e)
{
bool? result = Modal.Confirm(this, "Async Dialog", "This dialog will close after a 2-second task.",
bool? result = Modal.Confirm(this, "异步对话框", "对话框将在2s后关闭",
async () =>
{
await Task.Delay(2000);
@@ -325,20 +348,7 @@ public partial class MainWindow
if (sender is not ToggleButton tb) return;
var targetMode = tb.IsChecked == true ? ThemeMode.Dark : ThemeMode.Light;
try
{
_themeAnimating = true;
await ThemeManager.ApplyThemeAsync(targetMode, animate: true, animationDurationMs: 2000);
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine("[ThemeToggle] " + ex);
}
finally
{
_themeAnimating = false;
}
await ThemeManager.ApplyThemeAsync(targetMode, animationDurationMs: 800);
}
private void ColorPalette_OnClick(object sender, RoutedEventArgs e)