Compare commits

3 Commits

2 changed files with 14 additions and 15 deletions

View File

@@ -13,7 +13,7 @@
<MicaBackdrop /> <MicaBackdrop />
</Window.SystemBackdrop> </Window.SystemBackdrop>
<Grid> <Grid x:Name="RootGrid">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200"/> <ColumnDefinition Width="200"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
@@ -381,14 +381,12 @@
BorderThickness="0" BorderThickness="0"
CornerRadius="6" CornerRadius="6"
Padding="16,10" Padding="16,10"
MinWidth="140"> MinWidth="140"
<TextBlock x:Name="HotkeyRecorderText"
Text="Alt + F9"
FontFamily="Consolas" FontFamily="Consolas"
FontSize="14" FontSize="14"
FontWeight="Bold" FontWeight="Bold"
Foreground="#E8FF47"/> Foreground="#E8FF47"
</Button> Content="Alt + F9"/>
</StackPanel> </StackPanel>
</Border> </Border>

View File

@@ -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;
} }