|
|
@ -25,11 +25,12 @@ |
|
|
</MenuItem> |
|
|
</MenuItem> |
|
|
<MenuItem Header="Edit"> |
|
|
<MenuItem Header="Edit"> |
|
|
<MenuItem Header="Go To"> |
|
|
<MenuItem Header="Go To"> |
|
|
<MenuItem Header="Go To Line"/> |
|
|
<MenuItem Header="Go To Line" /> |
|
|
</MenuItem> |
|
|
</MenuItem> |
|
|
</MenuItem> |
|
|
</MenuItem> |
|
|
<MenuItem Header="View"> |
|
|
<MenuItem Header="View"> |
|
|
<MenuItem Header="Designer" InputGesture="Shift+F7" /> |
|
|
<MenuItem Header="Designer" |
|
|
|
|
|
InputGesture="Shift+F7" /> |
|
|
</MenuItem> |
|
|
</MenuItem> |
|
|
<MenuItem Header="Project"> |
|
|
<MenuItem Header="Project"> |
|
|
<MenuItem Header="Add class" /> |
|
|
<MenuItem Header="Add class" /> |
|
|
@ -40,9 +41,10 @@ |
|
|
|
|
|
|
|
|
<Styles.Resources> |
|
|
<Styles.Resources> |
|
|
<conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" /> |
|
|
<conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" /> |
|
|
|
|
|
<x:Double x:Key="MenuFlyoutSubItemPopupHorizontalOffset">-4</x:Double> |
|
|
<Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness> |
|
|
<Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness> |
|
|
<Thickness x:Key="MenuIconPresenterMargin">0,0,12,0</Thickness> |
|
|
<Thickness x:Key="MenuIconPresenterMargin">0,0,12,0</Thickness> |
|
|
<Thickness x:Key="MenuInputGestureTextMargin">24,0,0,0</Thickness> |
|
|
<Thickness x:Key="MenuInputGestureTextMargin">24,0,0,0</Thickness> |
|
|
<StreamGeometry x:Key="MenuItemChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry> |
|
|
<StreamGeometry x:Key="MenuItemChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry> |
|
|
</Styles.Resources> |
|
|
</Styles.Resources> |
|
|
|
|
|
|
|
|
@ -54,83 +56,84 @@ |
|
|
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" /> |
|
|
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" /> |
|
|
<Setter Property="Template"> |
|
|
<Setter Property="Template"> |
|
|
<ControlTemplate> |
|
|
<ControlTemplate> |
|
|
<Border Name="PART_LayoutRoot" |
|
|
<Panel> |
|
|
Padding="{TemplateBinding Padding}" |
|
|
<Border Name="PART_LayoutRoot" |
|
|
Background="{TemplateBinding Background}" |
|
|
Padding="{TemplateBinding Padding}" |
|
|
BorderBrush="{TemplateBinding BorderBrush}" |
|
|
Background="{TemplateBinding Background}" |
|
|
BorderThickness="{TemplateBinding BorderThickness}"> |
|
|
BorderBrush="{TemplateBinding BorderBrush}" |
|
|
<Grid> |
|
|
BorderThickness="{TemplateBinding BorderThickness}"> |
|
|
<Grid.ColumnDefinitions> |
|
|
<Grid> |
|
|
<ColumnDefinition Width="Auto" |
|
|
<Grid.ColumnDefinitions> |
|
|
SharedSizeGroup="MenuItemIcon" /> |
|
|
<ColumnDefinition Width="Auto" |
|
|
<ColumnDefinition Width="*" /> |
|
|
SharedSizeGroup="MenuItemIcon" /> |
|
|
<ColumnDefinition Width="Auto" |
|
|
<ColumnDefinition Width="*" /> |
|
|
SharedSizeGroup="MenuItemIGT" /> |
|
|
<ColumnDefinition Width="Auto" |
|
|
<ColumnDefinition Width="Auto" |
|
|
SharedSizeGroup="MenuItemIGT" /> |
|
|
SharedSizeGroup="MenuItemChevron" /> |
|
|
<ColumnDefinition Width="Auto" |
|
|
</Grid.ColumnDefinitions> |
|
|
SharedSizeGroup="MenuItemChevron" /> |
|
|
<ContentPresenter Name="PART_IconPresenter" |
|
|
</Grid.ColumnDefinitions> |
|
|
Content="{TemplateBinding Icon}" |
|
|
<ContentPresenter Name="PART_IconPresenter" |
|
|
Width="16" |
|
|
Content="{TemplateBinding Icon}" |
|
|
Height="16" |
|
|
Width="16" |
|
|
Margin="{DynamicResource MenuIconPresenterMargin}" |
|
|
Height="16" |
|
|
HorizontalAlignment="Center" |
|
|
Margin="{DynamicResource MenuIconPresenterMargin}" |
|
|
VerticalAlignment="Center"/> |
|
|
HorizontalAlignment="Center" |
|
|
|
|
|
VerticalAlignment="Center" /> |
|
|
|
|
|
|
|
|
<ContentPresenter Name="PART_HeaderPresenter" |
|
|
<ContentPresenter Name="PART_HeaderPresenter" |
|
|
Content="{TemplateBinding Header}" |
|
|
Content="{TemplateBinding Header}" |
|
|
VerticalAlignment="Center" |
|
|
VerticalAlignment="Center" |
|
|
HorizontalAlignment="Stretch" |
|
|
HorizontalAlignment="Stretch" |
|
|
TextBlock.Foreground="{TemplateBinding Foreground}" |
|
|
TextBlock.Foreground="{TemplateBinding Foreground}" |
|
|
Grid.Column="1"> |
|
|
Grid.Column="1"> |
|
|
<ContentPresenter.DataTemplates> |
|
|
<ContentPresenter.DataTemplates> |
|
|
<DataTemplate DataType="sys:String"> |
|
|
<DataTemplate DataType="sys:String"> |
|
|
<AccessText Text="{Binding}" /> |
|
|
<AccessText Text="{Binding}" /> |
|
|
</DataTemplate> |
|
|
</DataTemplate> |
|
|
</ContentPresenter.DataTemplates> |
|
|
</ContentPresenter.DataTemplates> |
|
|
</ContentPresenter> |
|
|
</ContentPresenter> |
|
|
<TextBlock x:Name="PART_InputGestureText" |
|
|
<TextBlock x:Name="PART_InputGestureText" |
|
|
Grid.Column="2" |
|
|
Grid.Column="2" |
|
|
Classes="CaptionTextBlockStyle" |
|
|
Classes="CaptionTextBlockStyle" |
|
|
Margin="{DynamicResource MenuInputGestureTextMargin}" |
|
|
Margin="{DynamicResource MenuInputGestureTextMargin}" |
|
|
Text="{TemplateBinding InputGesture, |
|
|
Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}" |
|
|
Converter={StaticResource KeyGestureConverter}}" |
|
|
HorizontalAlignment="Right" |
|
|
HorizontalAlignment="Right" |
|
|
VerticalAlignment="Center" /> |
|
|
VerticalAlignment="Center" /> |
|
|
<Path Name="PART_ChevronPath" |
|
|
<Path Name="PART_ChevronPath" |
|
|
Stretch="Uniform" |
|
|
Stretch="Uniform" |
|
|
Width="8" |
|
|
Width="8" |
|
|
Height="16" |
|
|
Height="16" |
|
|
Data="{StaticResource MenuItemChevronPathData}" |
|
|
Data="{StaticResource MenuItemChevronPathData}" |
|
|
Margin="{DynamicResource MenuFlyoutItemChevronMargin}" |
|
|
Margin="{DynamicResource MenuFlyoutItemChevronMargin}" |
|
|
VerticalAlignment="Center" |
|
|
VerticalAlignment="Center" |
|
|
Grid.Column="3" /> |
|
|
Grid.Column="3" /> |
|
|
</Grid> |
|
|
<Popup Name="PART_Popup" |
|
|
</Border> |
|
|
WindowManagerAddShadowHint="True" |
|
|
<Popup Name="PART_Popup" |
|
|
PlacementMode="Right" |
|
|
WindowManagerAddShadowHint="True" |
|
|
StaysOpen="True" |
|
|
PlacementMode="Right" |
|
|
IsOpen="{TemplateBinding IsSubMenuOpen, |
|
|
HorizontalOffset="{StaticResource MenuFlyoutSubItemPopupHorizontalOffset}" |
|
|
Mode=TwoWay}"> |
|
|
StaysOpen="True" |
|
|
<Border Background="{DynamicResource MenuFlyoutPresenterBackground}" |
|
|
IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"> |
|
|
BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}" |
|
|
<Border Background="{DynamicResource MenuFlyoutPresenterBackground}" |
|
|
BorderThickness="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" |
|
|
BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}" |
|
|
Padding="{DynamicResource MenuFlyoutPresenterThemePadding}" |
|
|
BorderThickness="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" |
|
|
MaxWidth="{DynamicResource FlyoutThemeMaxWidth}" |
|
|
Padding="{DynamicResource MenuFlyoutPresenterThemePadding}" |
|
|
MinHeight="{DynamicResource MenuFlyoutThemeMinHeight}" |
|
|
MaxWidth="{DynamicResource FlyoutThemeMaxWidth}" |
|
|
HorizontalAlignment="Stretch" |
|
|
MinHeight="{DynamicResource MenuFlyoutThemeMinHeight}" |
|
|
CornerRadius="{DynamicResource OverlayCornerRadius}"> |
|
|
HorizontalAlignment="Stretch" |
|
|
<ScrollViewer> |
|
|
CornerRadius="{DynamicResource OverlayCornerRadius}"> |
|
|
<ItemsPresenter Name="PART_ItemsPresenter" |
|
|
<ScrollViewer> |
|
|
Items="{TemplateBinding Items}" |
|
|
<ItemsPresenter Name="PART_ItemsPresenter" |
|
|
ItemsPanel="{TemplateBinding ItemsPanel}" |
|
|
Items="{TemplateBinding Items}" |
|
|
ItemTemplate="{TemplateBinding ItemTemplate}" |
|
|
ItemsPanel="{TemplateBinding ItemsPanel}" |
|
|
Margin="{DynamicResource MenuFlyoutScrollerMargin}" |
|
|
ItemTemplate="{TemplateBinding ItemTemplate}" |
|
|
Grid.IsSharedSizeScope="True" /> |
|
|
Margin="{DynamicResource MenuFlyoutScrollerMargin}" |
|
|
</ScrollViewer> |
|
|
Grid.IsSharedSizeScope="True" /> |
|
|
</Border> |
|
|
</ScrollViewer> |
|
|
</Popup> |
|
|
</Border> |
|
|
</Grid> |
|
|
</Popup> |
|
|
</Border> |
|
|
</Panel> |
|
|
</ControlTemplate> |
|
|
</ControlTemplate> |
|
|
</Setter> |
|
|
</Setter> |
|
|
</Style> |
|
|
</Style> |
|
|
@ -145,6 +148,8 @@ |
|
|
<Panel> |
|
|
<Panel> |
|
|
<ContentPresenter Name="PART_HeaderPresenter" |
|
|
<ContentPresenter Name="PART_HeaderPresenter" |
|
|
Content="{TemplateBinding Header}" |
|
|
Content="{TemplateBinding Header}" |
|
|
|
|
|
VerticalAlignment="Center" |
|
|
|
|
|
HorizontalAlignment="Stretch" |
|
|
Margin="{TemplateBinding Padding}"> |
|
|
Margin="{TemplateBinding Padding}"> |
|
|
<ContentPresenter.DataTemplates> |
|
|
<ContentPresenter.DataTemplates> |
|
|
<DataTemplate DataType="sys:String"> |
|
|
<DataTemplate DataType="sys:String"> |
|
|
@ -155,8 +160,7 @@ |
|
|
<Popup Name="PART_Popup" |
|
|
<Popup Name="PART_Popup" |
|
|
WindowManagerAddShadowHint="False" |
|
|
WindowManagerAddShadowHint="False" |
|
|
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" |
|
|
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" |
|
|
IsOpen="{TemplateBinding IsSubMenuOpen, |
|
|
IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}" |
|
|
Mode=TwoWay}" |
|
|
|
|
|
StaysOpen="True"> |
|
|
StaysOpen="True"> |
|
|
<Border Background="{DynamicResource MenuFlyoutPresenterBackground}" |
|
|
<Border Background="{DynamicResource MenuFlyoutPresenterBackground}" |
|
|
BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}" |
|
|
BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}" |
|
|
@ -183,10 +187,15 @@ |
|
|
</Style> |
|
|
</Style> |
|
|
|
|
|
|
|
|
<Style Selector="MenuItem"> |
|
|
<Style Selector="MenuItem"> |
|
|
<!-- Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future. --> |
|
|
<!-- Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future. --> |
|
|
<Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePaddingNarrow}" /> |
|
|
<Setter Property="Padding" Value="{StaticResource MenuFlyoutItemThemePaddingNarrow}" /> |
|
|
</Style> |
|
|
</Style> |
|
|
|
|
|
|
|
|
|
|
|
<Style Selector="Menu > MenuItem"> |
|
|
|
|
|
<!-- Custom padding for Menu > MenuItem --> |
|
|
|
|
|
<Setter Property="Padding" Value="{StaticResource MenuBarItemPadding}" /> |
|
|
|
|
|
</Style> |
|
|
|
|
|
|
|
|
<Style Selector="MenuItem /template/ ContentPresenter#PART_IconPresenter"> |
|
|
<Style Selector="MenuItem /template/ ContentPresenter#PART_IconPresenter"> |
|
|
<Setter Property="IsVisible" Value="False" /> |
|
|
<Setter Property="IsVisible" Value="False" /> |
|
|
</Style> |
|
|
</Style> |
|
|
@ -212,14 +221,15 @@ |
|
|
<Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" /> |
|
|
<Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" /> |
|
|
</Style> |
|
|
</Style> |
|
|
|
|
|
|
|
|
<Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot"> |
|
|
<!-- Listen for PART_LayoutRoot:pointerover, so it will not be triggered when subitem is pressed --> |
|
|
|
|
|
<Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover"> |
|
|
<Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPressed}" /> |
|
|
<Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPressed}" /> |
|
|
<Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutItemBorderBrushPressed}" /> |
|
|
<Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutItemBorderBrushPressed}" /> |
|
|
</Style> |
|
|
</Style> |
|
|
<Style Selector="MenuItem:pressed /template/ TextBlock#PART_InputGestureText"> |
|
|
<Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover TextBlock#PART_InputGestureText"> |
|
|
<Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" /> |
|
|
<Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" /> |
|
|
</Style> |
|
|
</Style> |
|
|
<Style Selector="MenuItem:pressed /template/ Path#PART_ChevronPath"> |
|
|
<Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover Path#PART_ChevronPath"> |
|
|
<Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPressed}" /> |
|
|
<Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPressed}" /> |
|
|
</Style> |
|
|
</Style> |
|
|
|
|
|
|
|
|
|
Jumar Macato
6 years ago
GitHub