prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Do not register dialog jump hotkey when dialog jump is disabled

Browse source
This commit is contained in:
Jack251970 2025-07-20 20:58:49 +08:00
parent adb1adb209
commit b88e2e9e8e
2 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Flow.Launcher.Infrastructure/UserSettings/Settings.cs
View file

@ -531,7 +531,19 @@ namespace Flow.Launcher.Infrastructure.UserSettings
}
};
public bool EnableDialogJump { get; set; } = true;
private bool _enableDialogJump = true;
public bool EnableDialogJump
{
get => _enableDialogJump;
set
{
if (_enableDialogJump != value)
{
_enableDialogJump = value;
OnPropertyChanged();
}
}
}
public bool AutoDialogJump { get; set; } = false;

26
Flow.Launcher/Helper/HotKeyMapper.cs
View file

@ -139,6 +139,11 @@ internal static class HotKeyMapper
foreach (var hotkey in list)
{
_settings.RegisteredHotkeys.Add(hotkey);
if (hotkey.RegisteredType == RegisteredHotkeyType.DialogJump && !_settings.EnableDialogJump)
{
// If dialog jump is disabled, do not register the hotkey
continue;
}
SetHotkey(hotkey);
}
@ -158,7 +163,10 @@ internal static class HotKeyMapper
ChangeRegisteredHotkey(RegisteredHotkeyType.Toggle, _settings.Hotkey);
break;
case nameof(_settings.DialogJumpHotkey):
ChangeRegisteredHotkey(RegisteredHotkeyType.DialogJump, _settings.DialogJumpHotkey);
ChangeRegisteredHotkey(RegisteredHotkeyType.DialogJump, _settings.DialogJumpHotkey, _settings.EnableDialogJump);
break;
case nameof(_settings.EnableDialogJump):
ChangeRegisteredHotkey(RegisteredHotkeyType.DialogJump, _settings.DialogJumpHotkey, _settings.EnableDialogJump);
break;
// Flow Launcher window hotkeys
@ -592,22 +600,19 @@ internal static class HotKeyMapper
#region Hotkey Changing
private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, string newHotkeyStr)
private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, string newHotkeyStr, bool setHotkey = true)
{
var newHotkey = new HotkeyModel(newHotkeyStr);
ChangeRegisteredHotkey(registeredType, newHotkey);
ChangeRegisteredHotkey(registeredType, newHotkey, setHotkey);
}
private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, HotkeyModel newHotkey)
private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, HotkeyModel newHotkey, bool setHotkey = true)
{
// Find the old registered hotkey data item
var registeredHotkeyData = _settings.RegisteredHotkeys.FirstOrDefault(h => h.RegisteredType == registeredType);
// If it is not found, return
if (registeredHotkeyData == null)
{
return;
}
if (registeredHotkeyData == null) return;
// Remove the old hotkey
RemoveHotkey(registeredHotkeyData);
@ -616,7 +621,10 @@ internal static class HotKeyMapper
registeredHotkeyData.SetHotkey(newHotkey);
// Set the new hotkey
SetHotkey(registeredHotkeyData);
if (setHotkey)
{
SetHotkey(registeredHotkeyData);
}
}
#endregion