Skip to content

Commit b033143

Browse files
committed
fix: bug太多,还是先不支持等宽字体了
1 parent ec5ebaa commit b033143

File tree

2 files changed

+10
-30
lines changed

2 files changed

+10
-30
lines changed

llcomNext/LLCOM/ViewModels/Pages/SettingPageViewModel.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public SettingPageViewModel(Func<Type, ViewModelBase> getService)
4646
foreach (var f in monoFonts)
4747
MonoFontList.Add(f);
4848
//找找看当前设置的是什么字体,对应上
49-
RefreshFontIndexCommand.Execute(null);
49+
RefreshFontIndex();
5050

5151
//是否已经检查过更新?
5252
if (Services.Utils.HasUpdate())
@@ -95,18 +95,16 @@ public SettingPageViewModel(Func<Type, ViewModelBase> getService)
9595
private int _packetHeaderFontIndex;
9696
[ObservableProperty]
9797
private int _packetExtraFontIndex;
98-
[ObservableProperty]
99-
private bool _useMonoFont;
10098

10199
[RelayCommand]
102100
private void RefreshFontIndex()
103101
{
104-
var list = UseMonoFont ? MonoFontList : SystemFontList;
102+
var list = SystemFontList;
105103
//刷新字体索引
106-
PacketFontIndex = list.IndexOf(Services.Utils.Setting.PacketFont);
107-
PacketHexFontIndex = list.IndexOf(Services.Utils.Setting.PacketHexFont);
108-
PacketHeaderFontIndex = list.IndexOf(Services.Utils.Setting.PacketHeaderFont);
109-
PacketExtraFontIndex = list.IndexOf(Services.Utils.Setting.PacketExtraFont);
104+
PacketFontIndex = list.IndexOf(Services.Utils.Setting.PacketFontFamily ?? "");
105+
PacketHexFontIndex = list.IndexOf(Services.Utils.Setting.PacketHexFontFamily?? "");
106+
PacketHeaderFontIndex = list.IndexOf(Services.Utils.Setting.PacketHeaderFontFamily?? "");
107+
PacketExtraFontIndex = list.IndexOf(Services.Utils.Setting.PacketExtraFontFamily?? "");
110108
}
111109

112110
#endregion

llcomNext/LLCOM/Views/Pages/SettingPageView.axaml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@
1414
<Design.DataContext>
1515
<vm:SettingPageViewModel />
1616
</Design.DataContext>
17-
<UserControl.Styles>
18-
<Style Selector="ComboBox.ListFontAll">
19-
<Setter Property="ItemsSource" Value="{Binding SystemFontList}" />
20-
</Style>
21-
<Style Selector="ComboBox.ListFontMono">
22-
<Setter Property="ItemsSource" Value="{Binding MonoFontList}" />
23-
</Style>
24-
</UserControl.Styles>
2517
<TabControl>
2618
<TabItem Header="常规设置">
2719
<ScrollViewer Background="{DynamicResource SemiGrey0}">
@@ -33,12 +25,6 @@
3325
<TabItem Header="外观与字体" IsSelected="True">
3426
<ScrollViewer Background="{DynamicResource SemiGrey0}">
3527
<StackPanel Margin="10" Spacing="5">
36-
<CheckBox
37-
Margin="5,5,5,0"
38-
Command="{Binding RefreshFontIndexCommand}"
39-
Content="限制使用等宽字体"
40-
IsChecked="{Binding UseMonoFont}" />
41-
<Separator Margin="0,10" />
4228
<Grid
4329
Margin="5,0"
4430
ColumnDefinitions="*, 250"
@@ -52,8 +38,7 @@
5238
Grid.Row="0"
5339
Grid.Column="1"
5440
Width="250"
55-
Classes.ListFontAll="{Binding !UseMonoFont}"
56-
Classes.ListFontMono="{Binding UseMonoFont}"
41+
ItemsSource="{Binding SystemFontList}"
5742
SelectedIndex="{Binding PacketFontIndex}"
5843
SelectedItem="{Binding PacketFontFamily, Source={x:Static services:Utils.Setting}}">
5944
<ComboBox.ItemTemplate>
@@ -71,8 +56,7 @@
7156
Grid.Row="2"
7257
Grid.Column="1"
7358
Width="250"
74-
Classes.ListFontAll="{Binding !UseMonoFont}"
75-
Classes.ListFontMono="{Binding UseMonoFont}"
59+
ItemsSource="{Binding SystemFontList}"
7660
SelectedIndex="{Binding PacketHexFontIndex}"
7761
SelectedItem="{Binding PacketHexFontFamily, Source={x:Static services:Utils.Setting}}">
7862
<ComboBox.ItemTemplate>
@@ -90,8 +74,7 @@
9074
Grid.Row="4"
9175
Grid.Column="1"
9276
Width="250"
93-
Classes.ListFontAll="{Binding !UseMonoFont}"
94-
Classes.ListFontMono="{Binding UseMonoFont}"
77+
ItemsSource="{Binding SystemFontList}"
9578
SelectedIndex="{Binding PacketHeaderFontIndex}"
9679
SelectedItem="{Binding PacketHeaderFontFamily, Source={x:Static services:Utils.Setting}}">
9780
<ComboBox.ItemTemplate>
@@ -109,8 +92,7 @@
10992
Grid.Row="6"
11093
Grid.Column="1"
11194
Width="250"
112-
Classes.ListFontAll="{Binding !UseMonoFont}"
113-
Classes.ListFontMono="{Binding UseMonoFont}"
95+
ItemsSource="{Binding SystemFontList}"
11496
SelectedIndex="{Binding PacketExtraFontIndex}"
11597
SelectedItem="{Binding PacketExtraFontFamily, Source={x:Static services:Utils.Setting}}">
11698
<ComboBox.ItemTemplate>

0 commit comments

Comments
 (0)