javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed broken build after compoer fonts merge (#288)

Browse Source
This commit is contained in:
Tiktack
2024-07-18 21:02:03 +02:00
committed by GitHub
parent cf2f0ec936
commit 641454fa14
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Wino.Mail.ViewModels/ReadComposePanePageViewModel.cs
View File

@@ -38,23 +38,23 @@ namespace Wino.Mail.ViewModels
_fontService = fontService;
PreferencesService = preferencesService;
CurrentReaderFont = fontService.GetCurrentReaderFont();
CurrentReaderFontSize = fontService.GetCurrentReaderFontSize();
CurrentReaderFont = preferencesService.ReaderFont;
CurrentReaderFontSize = preferencesService.ReaderFontSize;
CurrentComposerFont = fontService.GetCurrentComposerFont();
CurrentComposerFontSize = fontService.GetCurrentComposerFontSize();
CurrentComposerFont = preferencesService.ComposerFont;
CurrentComposerFontSize = preferencesService.ComposerFontSize;
}
public void Receive(PropertyChangedMessage<string> message)
{
if (message.PropertyName == nameof(CurrentReaderFont) && message.OldValue != message.NewValue)
{
_fontService.SetReaderFont(message.NewValue);
PreferencesService.ReaderFont = message.NewValue;
}
if (message.PropertyName == nameof(CurrentComposerFont) && message.OldValue != message.NewValue)
{
_fontService.SetComposerFont(message.NewValue);
PreferencesService.ComposerFont = message.NewValue;
}
}
@@ -62,11 +62,11 @@ namespace Wino.Mail.ViewModels
{
if (message.PropertyName == nameof(CurrentReaderFontSize))
{
_fontService.SetReaderFontSize(CurrentReaderFontSize);
PreferencesService.ReaderFontSize = CurrentReaderFontSize;
}
else if (message.PropertyName == nameof(CurrentComposerFontSize))
{
_fontService.SetComposerFontSize(CurrentComposerFontSize);
PreferencesService.ComposerFontSize = CurrentComposerFontSize;
}
}
}

6
Wino.Mail/Views/MailRenderingPage.xaml.cs
View File

@@ -30,7 +30,7 @@ namespace Wino.Views
IRecipient<ApplicationThemeChanged>,
IRecipient<SaveAsPDFRequested>
{
private readonly IFontService _fontService = App.Current.Services.GetService<IFontService>();
private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>();
private readonly IDialogService _dialogService = App.Current.Services.GetService<IDialogService>();
private bool isRenderingInProgress = false;
@@ -271,10 +271,10 @@ namespace Wino.Views
private async Task UpdateReaderFontPropertiesAsync()
{
await ExecuteScriptFunctionAsync("ChangeFontSize", _fontService.GetCurrentReaderFontSize());
await ExecuteScriptFunctionAsync("ChangeFontSize", _preferencesService.ReaderFontSize);
// Prepare font family name with fallback to sans-serif by default.
var fontName = _fontService.GetCurrentReaderFont();
var fontName = _preferencesService.ReaderFont;
// If font family name is not supported by the browser, fallback to sans-serif.
fontName += ", sans-serif";