Update MainWindow.xaml.cs to replace HotkeyRecorderText with HotkeyRecorderButton for displaying hotkey information, enhancing user interaction during hotkey recording. Adjustments made to ensure proper focus and event handling for the button.
This commit is contained in:
@@ -182,8 +182,8 @@ namespace ClipForge
|
|||||||
QualityLabel.Text = $"{s.VideoQuality}%";
|
QualityLabel.Text = $"{s.VideoQuality}%";
|
||||||
FramerateCombo.SelectedIndex = s.Framerate == 30 ? 0 : 1;
|
FramerateCombo.SelectedIndex = s.Framerate == 30 ? 0 : 1;
|
||||||
StartupToggle.IsOn = IsStartupEnabled();
|
StartupToggle.IsOn = IsStartupEnabled();
|
||||||
if (HotkeyRecorderText != null)
|
if (HotkeyRecorderButton != null)
|
||||||
HotkeyRecorderText.Text = HotkeyHelper.ToDisplayString((uint)s.HotkeyModifiers, (uint)s.HotkeyVirtualKey);
|
HotkeyRecorderButton.Content = HotkeyHelper.ToDisplayString((uint)s.HotkeyModifiers, (uint)s.HotkeyVirtualKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- STARTUP WITH WINDOWS ---
|
// --- STARTUP WITH WINDOWS ---
|
||||||
@@ -255,8 +255,9 @@ namespace ClipForge
|
|||||||
{
|
{
|
||||||
if (_isRecordingHotkey) return;
|
if (_isRecordingHotkey) return;
|
||||||
_isRecordingHotkey = true;
|
_isRecordingHotkey = true;
|
||||||
HotkeyRecorderText.Text = "Press any key...";
|
HotkeyRecorderButton.Content = "Press any key...";
|
||||||
this.KeyDown += OnHotkeyCaptureKeyDown;
|
HotkeyRecorderButton.Focus(FocusState.Programmatic);
|
||||||
|
HotkeyRecorderButton.KeyDown += OnHotkeyCaptureKeyDown;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnHotkeyCaptureKeyDown(object sender, KeyRoutedEventArgs e)
|
private void OnHotkeyCaptureKeyDown(object sender, KeyRoutedEventArgs e)
|
||||||
@@ -280,9 +281,9 @@ namespace ClipForge
|
|||||||
|
|
||||||
var ok = _hotkeyService.UpdateHotkey(mod, vk);
|
var ok = _hotkeyService.UpdateHotkey(mod, vk);
|
||||||
var display = HotkeyHelper.ToDisplayString(mod, vk);
|
var display = HotkeyHelper.ToDisplayString(mod, vk);
|
||||||
HotkeyRecorderText.Text = ok ? display : display + " (in use?)";
|
HotkeyRecorderButton.Content = ok ? display : display + " (in use?)";
|
||||||
|
|
||||||
this.KeyDown -= OnHotkeyCaptureKeyDown;
|
HotkeyRecorderButton.KeyDown -= OnHotkeyCaptureKeyDown;
|
||||||
_isRecordingHotkey = false;
|
_isRecordingHotkey = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user