Compare commits

...

2 Commits
7.5.4 ... 7.5.5

Author SHA1 Message Date
2dust
20457e9e63 up 7.5.5 2025-01-05 19:10:57 +08:00
2dust
e63042af84 Bug fix for fontsize 2025-01-05 19:10:12 +08:00
3 changed files with 4 additions and 2 deletions

View File

@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>7.5.4</Version> <Version>7.5.5</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -103,6 +103,8 @@ namespace v2rayN.Desktop.ViewModels
private void ModifyFontSize() private void ModifyFontSize()
{ {
double size = CurrentFontSize; double size = CurrentFontSize;
if (size < Global.MinFontSize) return;
Style style = new(x => Selectors.Or( Style style = new(x => Selectors.Or(
x.OfType<Button>(), x.OfType<Button>(),
x.OfType<TextBox>(), x.OfType<TextBox>(),

View File

@@ -158,7 +158,7 @@ namespace v2rayN.ViewModels
private void ModifyFontSize() private void ModifyFontSize()
{ {
double size = (long)CurrentFontSize; double size = (long)CurrentFontSize;
if (size < Global.MinFontSize) size = Global.MinFontSize; if (size < Global.MinFontSize) return;
Application.Current.Resources["StdFontSize"] = size; Application.Current.Resources["StdFontSize"] = size;
Application.Current.Resources["StdFontSize1"] = size + 1; Application.Current.Resources["StdFontSize1"] = size + 1;