Skip to content

Commit cde02a0

Browse files
committed
minor test
1 parent 3a91582 commit cde02a0

File tree

2 files changed

+5
-27
lines changed

2 files changed

+5
-27
lines changed

source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Windows/CommandBarFlyoutPage.xaml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,20 @@
1717
Label="Share"
1818
ToolTipService.ToolTip="Share">
1919
<ui:AppBarButton.Icon>
20-
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Share}"/>
20+
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Save}"/>
2121
</ui:AppBarButton.Icon>
2222

2323
</ui:AppBarButton>
2424
<ui:AppBarButton
2525
Click="OnElementClicked"
26+
Icon="Save"
2627
Label="Save"
27-
ToolTipService.ToolTip="Save" >
28-
<ui:AppBarButton.Icon>
29-
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Save}"/>
30-
</ui:AppBarButton.Icon>
31-
</ui:AppBarButton>
28+
ToolTipService.ToolTip="Save" />
3229
<ui:AppBarButton
3330
Click="OnElementClicked"
31+
Icon="Delete"
3432
Label="Delete"
35-
ToolTipService.ToolTip="Delete" >
36-
<ui:AppBarButton.Icon>
37-
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Delete}"/>
38-
</ui:AppBarButton.Icon>
39-
</ui:AppBarButton>
33+
ToolTipService.ToolTip="Delete" />
4034
<ui:CommandBarFlyout.SecondaryCommands>
4135
<ui:AppBarButton Click="OnElementClicked" Label="Resize" />
4236
<ui:AppBarButton Click="OnElementClicked" Label="Move" />
@@ -57,15 +51,6 @@
5751
AutomationProperties.Name="mountain"
5852
Click="MyImageButton_Click"
5953
ContextMenuOpening="MyImageButton_ContextMenuOpening">
60-
<Button.ContextMenu>
61-
<ContextMenu>
62-
<ContextMenu.Template>
63-
<ControlTemplate TargetType="{x:Type ContextMenu}">
64-
<Line Visibility="Collapsed"/>
65-
</ControlTemplate>
66-
</ContextMenu.Template>
67-
</ContextMenu>
68-
</Button.ContextMenu>
6954
<Image
7055
x:Name="Image1"
7156
Height="300"

source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Windows/CommandBarFlyoutPage.xaml.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,13 @@ private void OnElementClicked(object sender, RoutedEventArgs e)
3737

3838
private void ShowMenu(bool isTransient)
3939
{
40-
CommandBarFlyout1.ShowMode = isTransient ? FlyoutShowMode.Transient : FlyoutShowMode.Standard;
4140
CommandBarFlyout1.ShowAt(Image1);
4241
}
4342

4443
private void MyImageButton_ContextMenuOpening(object sender, ContextMenuEventArgs e)
4544
{
4645
// always show a context menu in standard mode
4746
ShowMenu(false);
48-
e.Handled = true;
4947
}
5048

5149
private void MyImageButton_Click(object sender, RoutedEventArgs e)
@@ -136,10 +134,5 @@ private void MyImageButton_Click(object sender, RoutedEventArgs e)
136134

137135
#endregion
138136

139-
private void OnRightMouseUp(object sender, MouseButtonEventArgs e)
140-
{
141-
// always show a context menu in standard mode
142-
//ShowMenu(false);
143-
}
144137
}
145138
}

0 commit comments

Comments
 (0)