-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Classic menu #1086
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Classic menu #1086
Changes from 39 commits
Commits
Show all changes
71 commits
Select commit
Hold shift + click to select a range
856ccb9
#981 adding ClassicMenu Control
IbraheemOsama 2388c94
#981 creating parital classes
IbraheemOsama b1d7520
#981 fixing double navigation issue
IbraheemOsama b8fd598
#981 adding clarifications to the sample page.
IbraheemOsama 0f0dd32
#981 removing unused references
IbraheemOsama 61acc21
#981 adding data to edit menu
IbraheemOsama aea3bb5
#981 fixing layout and adding comments
IbraheemOsama 43e96a1
#981 adding headers to all files
IbraheemOsama 1d43869
Merge remote-tracking branch 'refs/remotes/Microsoft/dev' into Classi…
IbraheemOsama 091faaf
#981 adding header to VsCommands file
IbraheemOsama ecd0544
#981 Apply Xaml styler roles to new Xaml files
IbraheemOsama 201644f
Adding colors to Classic Menu
IbraheemOsama 11e95c0
Applying some PR comments
IbraheemOsama 39a7b2b
Adding styling
IbraheemOsama 0e6637d
Adding items to edit menu
IbraheemOsama d6be89d
Creating a circular menu items
IbraheemOsama 4cc9d0e
Enhancing circular menu performance
IbraheemOsama 3693abf
changing classic menu to menu
IbraheemOsama dcfef83
adding border to items presenter
IbraheemOsama a20c4de
generlization the menu style
IbraheemOsama 8055fa1
Creating men selected item and navigate from menuItem to header
IbraheemOsama 3bef24d
Adding tapped to SelectedheaderItem
IbraheemOsama e5fad33
adding quick access alt button on menu item
IbraheemOsama e4ba89e
Merge remote-tracking branch 'refs/remotes/Microsoft/dev' into Classi…
IbraheemOsama d246391
adding input gesture text to header item
IbraheemOsama 008a4ba
Merge remote-tracking branch 'refs/remotes/Microsoft/dev' into Classi…
IbraheemOsama b9f1294
Update MenuPage with open file menu
IbraheemOsama dc12a3f
adding headerButton style for menu
IbraheemOsama fc4adcd
adding switching orientation
IbraheemOsama a2b3bc4
adding orientation change
IbraheemOsama 0a0624e
changing move header function
IbraheemOsama 1fe90f1
adding on menu open state
IbraheemOsama 14c432b
remvoing property name, minor change to retirger appveyor
IbraheemOsama a78f90e
Merge remote-tracking branch 'refs/remotes/Microsoft/dev' into Classi…
IbraheemOsama caedbe7
adding resource file for menu styles
IbraheemOsama 99bffdc
merging conflects
IbraheemOsama a5f01a6
adding menu folder to project after merging
IbraheemOsama 4253f83
adding .bind file as content in in build action
IbraheemOsama fc93320
Adding menu icon
IbraheemOsama 203098c
editing menu control styling
IbraheemOsama ab129cf
adding orientation to sample page and adding transition flag
IbraheemOsama bfe9695
Add item vector change to allow update flyout on new item add/change/…
IbraheemOsama 91c6c32
validating for flyout menu null
IbraheemOsama 3587d7c
adding dynamic item to sample page
IbraheemOsama c0dc082
Clicking alt return to last focus item
IbraheemOsama 23283b7
Adding menu item parent alt key requested
IbraheemOsama ec9afa4
Unregistering focus event of set focus on menu item
IbraheemOsama c854baf
Adding tooltip style and placement mode
IbraheemOsama 1c39eab
Adding tooltip check for show\hide
IbraheemOsama 50faf2f
adding support for AccessKeys for CU
IbraheemOsama ae51858
removing unused styles
IbraheemOsama 33f8bfb
Update documentations
IbraheemOsama 86d261e
Merge remote-tracking branch 'refs/remotes/Microsoft/dev' into Classi…
IbraheemOsama 015747a
Limit AllowTooltip to Menu control only
IbraheemOsama 184731f
prioritiese menu flyout popup than AccessKey
IbraheemOsama da18bf4
fixing caching problem
IbraheemOsama b529aa9
fixing IsInTransitionState
IbraheemOsama eafdcde
Adding removing input gesture on menunloaded
IbraheemOsama fa79558
Removing cached data on menu unload event
IbraheemOsama f2877f0
Merge remote-tracking branch 'refs/remotes/Microsoft/dev' into Classi…
IbraheemOsama 41ea514
Merging for dev
IbraheemOsama 6fde02e
fixing merge conflicts
IbraheemOsama d931857
Addine menu to readme.md
IbraheemOsama 03c7502
Adding documentations
IbraheemOsama 50ba981
Updating documentations
IbraheemOsama 4a143ae
Removing AccessKey from documentation as it is not working in MenuFly…
IbraheemOsama 57a3d67
Merge remote-tracking branch 'refs/remotes/Microsoft/dev' into Classi…
IbraheemOsama ab21155
Removing warning
IbraheemOsama 9324573
Renaming SelectedHeaderItem to SelectedMenuItem
IbraheemOsama 5e19294
Removing menu background
IbraheemOsama 9fee708
Merge remote-tracking branch 'refs/remotes/Microsoft/dev' into Classi…
IbraheemOsama File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/Commands/VsCommands.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // ****************************************************************** | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // This code is licensed under the MIT License (MIT). | ||
| // THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, | ||
| // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
| // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, | ||
| // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH | ||
| // THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE. | ||
| // ****************************************************************** | ||
|
|
||
| using System; | ||
| using System.Windows.Input; | ||
| using Windows.UI.Popups; | ||
|
|
||
| namespace Microsoft.Toolkit.Uwp.SampleApp.Menu.Commands | ||
| { | ||
| internal class NewProjectCommand : ICommand | ||
| { | ||
| public bool CanExecute(object parameter) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| public async void Execute(object parameter) | ||
| { | ||
| var dialog = new MessageDialog("Create New Project"); | ||
| await dialog.ShowAsync(); | ||
| } | ||
|
|
||
| public event EventHandler CanExecuteChanged; | ||
| } | ||
|
|
||
| internal class NewFileCommand : ICommand | ||
| { | ||
| public bool CanExecute(object parameter) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| public async void Execute(object parameter) | ||
| { | ||
| var dialog = new MessageDialog("Create New File"); | ||
| await dialog.ShowAsync(); | ||
| } | ||
|
|
||
| public event EventHandler CanExecuteChanged; | ||
| } | ||
|
|
||
| internal class GenericCommand : ICommand | ||
| { | ||
| public bool CanExecute(object parameter) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| public async void Execute(object parameter) | ||
| { | ||
| var dialog = new MessageDialog(parameter.ToString()); | ||
| await dialog.ShowAsync(); | ||
| } | ||
|
|
||
| public event EventHandler CanExecuteChanged; | ||
| } | ||
| } |
167 changes: 167 additions & 0 deletions
167
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/Menu.bind
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| <Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.MenuPage" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:commands="using:Microsoft.Toolkit.Uwp.SampleApp.Menu.Commands" | ||
| xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| mc:Ignorable="d"> | ||
|
|
||
| <Page.Resources> | ||
| <ResourceDictionary> | ||
| <ResourceDictionary.MergedDictionaries> | ||
| <ResourceDictionary Source="MenuStyles.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
|
|
||
| <commands:NewProjectCommand x:Key="NewProject" /> | ||
| <commands:NewFileCommand x:Key="NewFile" /> | ||
| <commands:GenericCommand x:Key="GenericCommand" /> | ||
| </ResourceDictionary> | ||
|
|
||
|
|
||
| </Page.Resources> | ||
|
|
||
| <Grid Background="{StaticResource Brush-Grey-05}"> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="auto" /> | ||
| <RowDefinition Height="auto" /> | ||
| </Grid.RowDefinitions> | ||
|
|
||
| <controls:Menu HeaderButtonStyle="{StaticResource MenuHeaderButtonStyle}" | ||
| MenuFlyoutStyle="{StaticResource MenuStyle}" | ||
| Orientation="Horizontal"> | ||
|
|
||
| <controls:MenuItem controls:Menu.InputGestureText="Alt+F" | ||
| Header="File"> | ||
| <MenuFlyoutSubItem Text="New"> | ||
| <MenuFlyoutItem controls:Menu.InputGestureText="Ctrl+Shift+N" | ||
| Command="{StaticResource NewProject}" | ||
| Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Project" /> | ||
| <MenuFlyoutItem controls:Menu.InputGestureText="Ctrl+N" | ||
| Command="{StaticResource NewFile}" | ||
| Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="File" /> | ||
| </MenuFlyoutSubItem> | ||
| <MenuFlyoutSubItem Text="Open"> | ||
| <MenuFlyoutItem controls:Menu.InputGestureText="Ctrl+Shift+O" | ||
| Command="{StaticResource GenericCommand}" | ||
| CommandParameter="Select Project/Solution" | ||
| Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Project/Solution" /> | ||
| <MenuFlyoutItem controls:Menu.InputGestureText="Ctrl+O" | ||
| Command="{StaticResource GenericCommand}" | ||
| CommandParameter="Select File" | ||
| Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="File" /> | ||
| </MenuFlyoutSubItem> | ||
| <MenuFlyoutSeparator /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Page Setup" /> | ||
| <MenuFlyoutItem controls:Menu.InputGestureText="Ctrl+P" | ||
| Command="{StaticResource GenericCommand}" | ||
| CommandParameter="Page is Printed!!" | ||
| Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Print" /> | ||
| <MenuFlyoutSeparator /> | ||
| <MenuFlyoutSubItem Text="Recent Files"> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="UWP ToolKit GridSplitter" /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="UWP ToolKit WrapPanel" /> | ||
| </MenuFlyoutSubItem> | ||
| <MenuFlyoutItem controls:Menu.InputGestureText="Ctrl+Shit+E" | ||
| Command="{StaticResource GenericCommand}" | ||
| CommandParameter="Solution closed" | ||
| Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Exit" /> | ||
| </controls:MenuItem> | ||
|
|
||
|
|
||
| <controls:MenuItem Header="Edit"> | ||
| <MenuFlyoutSubItem Text="Go To"> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Go To Line" /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Go To All" /> | ||
| </MenuFlyoutSubItem> | ||
|
|
||
| <MenuFlyoutSubItem Text="Find and Replace"> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Find" /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Replace" /> | ||
| </MenuFlyoutSubItem> | ||
| </controls:MenuItem> | ||
|
|
||
| <controls:MenuItem Header="View"> | ||
| <MenuFlyoutSubItem Text="Designer"> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="VS Designer" /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Blend" /> | ||
| </MenuFlyoutSubItem> | ||
|
|
||
| <MenuFlyoutSubItem Text="Solution Explorer"> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Solutions" /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Projects" /> | ||
| </MenuFlyoutSubItem> | ||
| </controls:MenuItem> | ||
|
|
||
| <controls:MenuItem Header="Project"> | ||
| <MenuFlyoutSubItem Text="Add Class"> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Class" /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Interface" /> | ||
| </MenuFlyoutSubItem> | ||
|
|
||
| <MenuFlyoutSubItem Text="Add new data source"> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="SQL" /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="NoSQL" /> | ||
| </MenuFlyoutSubItem> | ||
| </controls:MenuItem> | ||
|
|
||
| <controls:MenuItem Header="Build"> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Build Solution" /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Rebuild Solution" /> | ||
| </controls:MenuItem> | ||
|
|
||
| <controls:MenuItem Header="Debug"> | ||
| <MenuFlyoutSubItem Text="Windows"> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Windows 8" /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Windows 10" /> | ||
| </MenuFlyoutSubItem> | ||
|
|
||
| <MenuFlyoutSubItem Text="Graphics"> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Canvas" /> | ||
| <MenuFlyoutItem Style="{StaticResource MenuFlyoutItemStyle}" | ||
| Text="Grid" /> | ||
| </MenuFlyoutSubItem> | ||
| </controls:MenuItem> | ||
|
|
||
| </controls:Menu> | ||
|
|
||
| <StackPanel Grid.Row="1"> | ||
| <TextBlock Text="Click Alt to set focus on Classic Menu" /> | ||
| <TextBlock Text="To open file menu shortcut: Alt+F" /> | ||
| <TextBlock Text="Create new project shortcut: Ctrl+Shift+N" /> | ||
| <TextBlock Text="Create new file shortcut: Ctrl+N" /> | ||
| <TextBlock Text="Open project shortcut: Ctrl+Shift+O" /> | ||
| <TextBlock Text="Open file shortcut: Ctrl+O" /> | ||
| <TextBlock Text="Print shortcut: Ctrl+P" /> | ||
| <TextBlock Text="Exit solution shortcut: Ctrl+Shit+E" /> | ||
| </StackPanel> | ||
|
|
||
|
|
||
| </Grid> | ||
| </Page> | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested removing the MenuFlyoutStyle, and Styles for the MenuFlyoutItem and MenuFlyoutSubItem. I didn't see any issues with styling. Any reason we need to have these?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This what happened when I removed the MenyFlyoutStyle and MenuFlyoutItem and Sub styles
and this what happens when I removed the MenyFlyoutItem and SubItem styles
As you can see the problem is not with the first menuItem generation but with the second
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You also need to remove the implicit styles from the MenuStyles file. This is what I see:
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the default style for the menu which could be achieved by just adding the control, I wanted to show developers how they can style whatever they want beside I like the black colour more :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Understand, but it also seems like it's needed to get it up and running.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Anyone else have thoughts? @nmetulev ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do the sub-menu flyouts respect the parent RequestedTheme on the top level Classic Menu control?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree with @skendrot, if the styles are not necessary to get started, we should not have them in the sample app, it makes the control look much more complicated. If the styles are required, they should be part of the control.
I also see the need for having a way to showcase what is possible with the controls. Not sure if that should be in the sample app, or a sample outside of the app we can link to from the docs. We should probably have a larger discussion on this somewhere else :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great question @mdtauk. I tested this and the menu flyout does respect the requested theme but the menu itself does not.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed all styling from the sample and found that there is no indication that a particular menu is open. The MenuItem should have a visual state for when it's open