Skip to content

Fix cursor jumping away when switching keyboard layout #211

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
Radomir-Aksenenko wants to merge 2 commits into
base: dev/dev
Choose a base branch
from
Open

Fix cursor jumping away when switching keyboard layout #211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cef810
Fix: Prevent cursor position loss when switching keyboard layout (Shi…
Jan 19, 2026
da4cfed
Fix cursor jumping away when switching keyboard layout
Radomir-Aksenenko Jan 20, 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
48 changes: 48 additions & 0 deletions SkEditor/Views/Windows/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Avalonia.Interactivity;
using Avalonia.Media;
using Avalonia.Threading;
using AvaloniaEdit;
using CommunityToolkit.Mvvm.Input;
using FluentAvalonia.UI.Controls;
using FluentAvalonia.UI.Windowing;
Expand All @@ -25,6 +26,7 @@ public partial class MainWindow : AppWindow
private readonly SplashScreen? _splashScreen;
private bool _isFullyLoaded;
private WindowState _preFullScreenState;
private bool _layoutSwitchDetected;

public MainWindow(SplashScreen? splashScreen = null)
{
Expand Down Expand Up @@ -103,6 +105,52 @@ private void AddEvents()
};

AddHandler(DragDrop.DropEvent, FileHandler.FileDropAction);

AddHandler(KeyDownEvent, (_, e) =>
{
if (e.Key is Key.LeftAlt or Key.RightAlt && e.KeyModifiers.HasFlag(KeyModifiers.Shift))
{
_layoutSwitchDetected = true;
}
else if (e.Key is Key.LeftShift or Key.RightShift && e.KeyModifiers.HasFlag(KeyModifiers.Alt))
{
_layoutSwitchDetected = true;
}
else if (e.Key is Key.LeftShift or Key.RightShift && e.KeyModifiers.HasFlag(KeyModifiers.Control))
{
_layoutSwitchDetected = true;
}
else if (e.Key is Key.LeftCtrl or Key.RightCtrl && e.KeyModifiers.HasFlag(KeyModifiers.Shift))
{
_layoutSwitchDetected = true;
}
}, RoutingStrategies.Tunnel);

AddHandler(KeyUpEvent, (_, e) =>
{
bool isLayoutSwitchKey = e.Key is Key.LeftAlt or Key.RightAlt
or Key.LeftShift or Key.RightShift
or Key.LeftCtrl or Key.RightCtrl;

if (!isLayoutSwitchKey || !_layoutSwitchDetected)
{
return;
}

_layoutSwitchDetected = false;

OpenedFile? currentFile = SkEditorAPI.Files.GetCurrentOpenedFile();
if (currentFile?.Editor?.TextArea is not { } textArea)
{
return;
}

if (textArea.IsFocused)
{
e.Handled = true;
Dispatcher.UIThread.Post(() => textArea.Focus());
}
}, RoutingStrategies.Tunnel);
}

public void ReloadUiOfAddons()
Expand Down