Right and left click both will now open the context menu on Windows

This commit is contained in:
Grant Limberg 2017-02-14 16:31:11 -08:00
parent af4e79735c
commit aa2ee3f7be

View File

@ -20,54 +20,38 @@
<Grid> <Grid>
<tb:TaskbarIcon x:Name="MyNotifyIcon" <tb:TaskbarIcon x:Name="MyNotifyIcon"
IconSource="ZeroTierIcon.ico" IconSource="ZeroTierIcon.ico"
ToolTipText="ZeroTier One"> ToolTipText="ZeroTier One"
MenuActivation="LeftOrRightClick">
<tb:TaskbarIcon.ContextMenu> <tb:TaskbarIcon.ContextMenu>
<ContextMenu> <ContextMenu>
<ContextMenu.ItemsSource> <ContextMenu.ItemsSource>
<CompositeCollection> <CompositeCollection>
<MenuItem Header="Node ID: unknown" <MenuItem Header="Node ID: unknown"
Click="ToolbarItem_NodeIDClicked" Click="ToolbarItem_NodeIDClicked"
x:Name="nodeIdMenuItem"/> x:Name="nodeIdMenuItem"/>
<Separator/> <Separator/>
<MenuItem Header="Join Network..." <MenuItem Header="Join Network..."
Click="ToolbarItem_JoinNetworkClicked"/> Click="ToolbarItem_JoinNetworkClicked"/>
<MenuItem Header="Show Networks..." <MenuItem Header="Show Networks..."
Click="ToolbarItem_ShowNetworksClicked"/> Click="ToolbarItem_ShowNetworksClicked"/>
<Separator/> <Separator/>
<CollectionContainer Collection="{Binding Source={StaticResource KnownNetworks}}"> <CollectionContainer Collection="{Binding Source={StaticResource KnownNetworks}}">
</CollectionContainer>
<Separator/> </CollectionContainer>
<MenuItem Header="About..."
<Separator/>
<MenuItem Header="About..."
Click="ToolbarItem_AboutClicked"/> Click="ToolbarItem_AboutClicked"/>
<MenuItem Header="Preferences..." <MenuItem Header="Preferences..."
Click="ToolbarItem_PreferencesClicked"/> Click="ToolbarItem_PreferencesClicked"/>
<Separator/> <Separator/>
<MenuItem Header="Quit" <MenuItem Header="Quit"
Click="ToolbarItem_QuitClicked"/> Click="ToolbarItem_QuitClicked"/>
</CompositeCollection> </CompositeCollection>
</ContextMenu.ItemsSource> </ContextMenu.ItemsSource>
</ContextMenu>
<!--<MenuItem Header="Networks">
<MenuItem.ItemsSource>
<CompositeCollection>
<CollectionContainer Collection="{Binding Source={StaticResource KnownNetworks}}"/>
</CompositeCollection>
</MenuItem.ItemsSource>
<MenuItem.ItemContainerStyle>
<Style>
<Setter Property="MenuItem.Header" Value="{Binding Title}"/>
--><!-- <Setter Property="MenuItem.IsCheckable" Value="True"/> --><!--
<Setter Property="MenuItem.IsChecked" Value="{Binding IsConnected}"/>
<EventSetter Event="MenuItem.Click" Handler="ToolbarItem_NetworkClicked"/>
</Style>
</MenuItem.ItemContainerStyle>
</MenuItem>-->
</ContextMenu>
</tb:TaskbarIcon.ContextMenu> </tb:TaskbarIcon.ContextMenu>
</tb:TaskbarIcon> </tb:TaskbarIcon>