Skip to content

feat: Font Selector #2612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ennerperez wants to merge 1 commit into
base: develop
Choose a base branch
from
+16 −6
Open

feat: Font Selector #2612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/ViewModels/Preferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
using Avalonia.Collections;
using Avalonia.Media;
using CommunityToolkit.Mvvm.ComponentModel;

namespace SourceGit.ViewModels
Expand Down Expand Up @@ -61,6 +63,8 @@ public string ThemeOverrides
}
}

public IEnumerable<string> Fonts => FontManager.Current.SystemFonts.Select(f => f.FamilyNames.FirstOrDefault());

public string DefaultFontFamily
{
get => _defaultFontFamily;
Expand Down
18 changes: 12 additions & 6 deletions src/Views/Preferences.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,19 +210,25 @@
Text="{DynamicResource Text.Preferences.Appearance.DefaultFont}"
HorizontalAlignment="Right"
Margin="0,0,16,0"/>
<TextBox Grid.Row="1" Grid.Column="1"
Height="28"
CornerRadius="3"
Text="{Binding DefaultFontFamily, Mode=TwoWay}"/>
<ComboBox Grid.Row="1" Grid.Column="1"
Height="28"
HorizontalAlignment="Stretch"
Padding="8,0"
CornerRadius="3"
ItemsSource="{Binding Fonts, Mode=OneWay}"
SelectedItem="{Binding DefaultFontFamily, Mode=TwoWay}"/>

<TextBlock Grid.Row="2" Grid.Column="0"
Text="{DynamicResource Text.Preferences.Appearance.MonospaceFont}"
HorizontalAlignment="Right"
Margin="0,0,16,0"/>
<TextBox Grid.Row="2" Grid.Column="1"
<ComboBox Grid.Row="2" Grid.Column="1"
Height="28"
HorizontalAlignment="Stretch"
Padding="8,0"
CornerRadius="3"
Text="{Binding MonospaceFontFamily, Mode=TwoWay}"/>
ItemsSource="{Binding Fonts, Mode=OneWay}"
SelectedItem="{Binding MonospaceFontFamily, Mode=TwoWay}"/>

<TextBlock Grid.Row="3" Grid.Column="0"
Text="{DynamicResource Text.Preferences.Appearance.FontSize}"
Expand Down