Skip to content
This repository was archived by the owner on Apr 10, 2026. It is now read-only.

Bump Avalonia, Avalonia.AvaloniaEdit and AvaloniaEdit.TextMate #143

Draft
dependabot wants to merge 6 commits into
base: dev
Choose a base branch
from
Draft

Bump Avalonia, Avalonia.AvaloniaEdit and AvaloniaEdit.TextMate #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bef3ee2
Bump Avalonia, Avalonia.AvaloniaEdit and AvaloniaEdit.TextMate
dependabot[bot] Apr 8, 2026
9b179fc
Update ToolBarButton_GotFocus event handler parameter
Jack251970 Apr 9, 2026
b58541a
Replace SystemDecorations with WindowDecorations
Jack251970 Apr 9, 2026
bffa1b5
Update ToolBarButton_GotFocus event argument type
Jack251970 Apr 9, 2026
702fc31
Improve typeface character check for glyph existence
Jack251970 Apr 9, 2026
c8d93cd
Update README to reference Avalonia 12
Jack251970 Apr 9, 2026
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
2 changes: 1 addition & 1 deletion Editor/Controls/CharacterToolBar.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private void ToolBarButton_PointerEntered(object? sender, PointerEventArgs e)
}
}

private void ToolBarButton_GotFocus(object? sender, GotFocusEventArgs e)
private void ToolBarButton_GotFocus(object? sender, FocusChangedEventArgs e)
{
if (sender is Button)
{
Expand Down
2 changes: 1 addition & 1 deletion Editor/Controls/EquationToolBar.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private void ToolBarButton_PointerEntered(object? sender, PointerEventArgs e)
}
}

private void ToolBarButton_GotFocus(object? sender, GotFocusEventArgs e)
private void ToolBarButton_GotFocus(object? sender, FocusChangedEventArgs e)
{
if (sender is Button)
{
Expand Down
6 changes: 3 additions & 3 deletions Editor/Editor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.13" />
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
<PackageReference Include="AvaloniaEdit.TextMate" Version="11.4.1" />
<PackageReference Include="Avalonia" Version="12.0.0" />
<PackageReference Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
<PackageReference Include="AvaloniaEdit.TextMate" Version="12.0.0" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.13" />
<PackageReference Include="Clowd.Clipboard.Avalonia" Version="1.1.4" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
Expand Down
2 changes: 1 addition & 1 deletion Editor/Interfaces/IMainWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public interface IMainWindow

TopLevel TopLevel { get; }
WindowState WindowState { get; set; }
SystemDecorations SystemDecorations { get; set; }
WindowDecorations WindowDecorations { get; set; }
bool ContentDialogShown { get; }
bool IsSelecting { get; set; }
bool IsEditorLoaded { get; }
Expand Down
8 changes: 4 additions & 4 deletions Editor/ViewModels/MainWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public partial class MainWindowViewModel : ObservableObject, ICultureInfoChanged
private MenuItem _recentFileItem = null!;

private WindowState _windowState;
private SystemDecorations _systemDecorations;
private WindowDecorations _windowDecorations;
private bool _fullScreenModeEntered;
private readonly Lock _fullScreenModeLock = new();

Expand Down Expand Up @@ -353,9 +353,9 @@ public void EnterFullScreen()
if (_fullScreenModeEntered) return;

_windowState = MainWindow.WindowState;
_systemDecorations = MainWindow.SystemDecorations;
_windowDecorations = MainWindow.WindowDecorations;
MainWindow.WindowState = WindowState.FullScreen;
MainWindow.SystemDecorations = SystemDecorations.None;
MainWindow.WindowDecorations = WindowDecorations.None;

_fullScreenModeEntered = true;
}
Expand All @@ -373,7 +373,7 @@ public void ExitFullScreen(WindowState windowState)
if (!_fullScreenModeEntered) return;

MainWindow.WindowState = windowState;
MainWindow.SystemDecorations = _systemDecorations;
MainWindow.WindowDecorations = _windowDecorations;

_fullScreenModeEntered = false;
}
Expand Down
8 changes: 6 additions & 2 deletions Editor/ViewModels/UnicodeSelectorWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,12 @@ private static bool TypefaceContainsCharacter(Typeface typeface, char characterT
try
{
var glyphTypeface = typeface.GlyphTypeface;
uint codepoint = characterToCheck;
return glyphTypeface.TryGetGlyph(codepoint, out _);
int codepoint = characterToCheck;
if (glyphTypeface.CharacterToGlyphMap.TryGetGlyph(codepoint, out ushort glyphIndex))
{
return glyphIndex > 0;
}
return false;
}
catch (Exception e)
{
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Open-source, cross-platform equation editor built with Avalonia. A modern, free alternative to MathType for creating mathematical and scientific documents.

- Cross-platform: Windows, macOS, and Linux
- Fast desktop UI: Avalonia 11
- Fast desktop UI: Avalonia 12
- Modern .NET: .NET 10
- Open source: MIT licensed

Expand Down
Loading