Skip to content

Commit 0c130dc

Browse files
authored
Merge pull request #58 from grandixximo/cursor/fix-tray-icon-left-click-actions-a32a
Fix tray icon left click actions
2 parents 1d9e55f + 95f74c2 commit 0c130dc

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

src/Captura/Pages/TrayIconPage.xaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Page x:Class="Captura.TrayIconPage"
1+
<Page x:Class="Captura.TrayIconPage"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:hotkeys="clr-namespace:Captura;assembly=Captura.Hotkeys"
4+
xmlns:hotkeys="clr-namespace:Captura.Hotkeys;assembly=Captura.Hotkeys"
55
Title="{Binding TrayIcon, Source={StaticResource Loc}, Mode=OneWay}"
66
DataContext="{Binding MainViewModel, Source={StaticResource ServiceLocator}}">
77
<Grid Margin="10">
@@ -18,6 +18,12 @@
1818
Text="{Binding MinTrayClose, Source={StaticResource Loc}, Mode=OneWay}"/>
1919
</CheckBox>
2020

21+
<CheckBox IsChecked="{Binding Settings.Tray.MinToTrayOnCaptureStart}"
22+
Margin="0,2">
23+
<TextBlock TextWrapping="Wrap"
24+
Text="{Binding MinToTrayOnCaptureStart, Source={StaticResource Loc}, Mode=OneWay}"/>
25+
</CheckBox>
26+
2127
<CheckBox IsChecked="{Binding Settings.Tray.ShowNotifications}"
2228
Margin="0,2">
2329
<TextBlock TextWrapping="Wrap"
@@ -30,8 +36,8 @@
3036

3137
<ComboBox SelectedValue="{Binding Settings.Tray.LeftClickAction, Mode=TwoWay}"
3238
SelectedValuePath="ServiceName"
33-
DisplayMemberPath="Description.Display"
34-
ItemsSource="{Binding HotkeysViewModel.AllServices, Source={StaticResource ServiceLocator}}"/>
39+
DisplayMemberPath="Description"
40+
ItemsSource="{x:Static hotkeys:HotKeyManager.AllServices}"/>
3541
</DockPanel>
3642
</StackPanel>
3743
</Grid>

0 commit comments

Comments
 (0)