pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-11-06 12:35:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix UI (#10527)

Browse Source 
* Revert "Cache selected views in SimpleViewLocator"

This reverts commit 8ebbd7f4f8.

* Fix UI

* Optimize Styles

* Code clean
This commit is contained in:
DHR60
2026-11-05 02:08:04 +00:00
committed by GitHub
parent 9a029a3f7e
commit 66546700b0
10 changed files with 252 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
+3 -67
View File
@@ -1,16 +1,9 @@
using Avalonia.Controls.Notifications;
using Avalonia.Controls.Primitives;
using AvaloniaEdit;
using Semi.Avalonia;
namespace v2rayN.Desktop.ViewModels;
public partial class ThemeSettingViewModel : MyReactiveObject
{
private Style? _fontSizeStyle;
private Style? _fontSizeExStyle;
private Style? _fontFamilyStyle;
[Reactive] public partial string CurrentTheme { get; set; }
[Reactive] public partial int CurrentFontSize { get; set; }
@@ -102,26 +95,7 @@ public partial class ThemeSettingViewModel : MyReactiveObject
{
return;
}
var style = new Style(x => Selectors.Or(
x.OfType<Button>(),
x.OfType<TextBox>(),
x.OfType<TextBlock>(),
x.OfType<SelectableTextBlock>(),
x.OfType<Menu>(),
x.OfType<ContextMenu>(),
x.OfType<DataGridRow>(),
x.OfType<ListBoxItem>(),
x.OfType<HeaderedContentControl>(),
x.OfType<TextEditor>()
));
style.Add(new Setter
{
Property = TemplatedControl.FontSizeProperty,
Value = size,
});
ReplaceStyle(ref _fontSizeStyle, style);
Application.Current!.Resources["AppFontSize"] = size;
ModifyFontSizeEx(size);
}
@@ -129,10 +103,7 @@ public partial class ThemeSettingViewModel : MyReactiveObject
{
//DataGrid
var rowHeight = 20 + (size / 2);
var style = new Style(x => x.OfType<DataGrid>());
style.Add(new Setter(DataGrid.RowHeightProperty, rowHeight));
ReplaceStyle(ref _fontSizeExStyle, style);
Application.Current!.Resources["DataGridRowHeight"] = rowHeight;
}
private void ModifyFontFamily()
@@ -145,46 +116,11 @@ public partial class ThemeSettingViewModel : MyReactiveObject
try
{
var style = new Style(x => Selectors.Or(
x.OfType<Button>(),
x.OfType<TextBox>(),
x.OfType<TextBlock>(),
x.OfType<SelectableTextBlock>(),
x.OfType<Menu>(),
x.OfType<ContextMenu>(),
x.OfType<DataGridRow>(),
x.OfType<ListBoxItem>(),
x.OfType<HeaderedContentControl>(),
x.OfType<WindowNotificationManager>(),
x.OfType<TextEditor>()
));
style.Add(new Setter
{
Property = TemplatedControl.FontFamilyProperty,
Value = new FontFamily(currentFontFamily),
});
ReplaceStyle(ref _fontFamilyStyle, style);
Application.Current!.Resources["AppFontFamily"] = currentFontFamily;
}
catch (Exception ex)
{
Logging.SaveLog("ModifyFontFamily", ex);
}
}
private static void ReplaceStyle(ref Style? oldStyle, Style newStyle)
{
var app = Application.Current;
if (app is null)
{
return;
}
if (oldStyle is not null)
{
app.Styles.Remove(oldStyle);
}
oldStyle = newStyle;
app.Styles.Add(newStyle);
}
}