commit
1030fa47e7
@ -10,13 +10,11 @@
|
|||||||
<Setter Property="BorderBrush" Value="{DynamicResource AutoCompleteBoxDefaultBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource AutoCompleteBoxDefaultBorderBrush}" />
|
||||||
<Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="600" />
|
<Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="600" />
|
||||||
<Setter Property="BorderThickness" Value="1" />
|
<Setter Property="BorderThickness" Value="1" />
|
||||||
<Setter Property="Padding" Value="4" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="AutoCompleteBox">
|
<ControlTemplate TargetType="AutoCompleteBox">
|
||||||
<Panel>
|
<Panel>
|
||||||
<TextBox
|
<TextBox
|
||||||
Name="PART_TextBox"
|
Name="PART_TextBox"
|
||||||
Padding="{TemplateBinding Padding}"
|
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
|
@ -89,6 +89,15 @@
|
|||||||
<Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
<Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
||||||
<Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
<Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
||||||
|
|
||||||
|
<Style Selector="^:pointerover">
|
||||||
|
<Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
||||||
|
<Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^:pressed">
|
||||||
|
<Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
||||||
|
<Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
||||||
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Primary">
|
<Style Selector="^.Primary">
|
||||||
<Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
<Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
Viewport height is set from # of rows displayed (2-8) in Month mode, = ~290 for 6 weeks (+ day names)
|
Viewport height is set from # of rows displayed (2-8) in Month mode, = ~290 for 6 weeks (+ day names)
|
||||||
-->
|
-->
|
||||||
<Grid
|
<Grid
|
||||||
MinWidth="200"
|
MinWidth="{DynamicResource CalendarMinWidth}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
RowDefinitions="Auto,*">
|
RowDefinitions="Auto,*">
|
||||||
|
@ -172,18 +172,19 @@
|
|||||||
</Border>
|
</Border>
|
||||||
<Popup
|
<Popup
|
||||||
Name="PART_Popup"
|
Name="PART_Popup"
|
||||||
HorizontalOffset="{DynamicResource MenuFlyoutSubItemPopupHorizontalOffset}"
|
HorizontalOffset="-8"
|
||||||
IsLightDismissEnabled="False"
|
IsLightDismissEnabled="False"
|
||||||
IsOpen="{TemplateBinding IsSubMenuOpen,
|
IsOpen="{TemplateBinding IsSubMenuOpen,
|
||||||
Mode=TwoWay}"
|
Mode=TwoWay}"
|
||||||
PlacementMode="Right"
|
PlacementMode="Right"
|
||||||
|
VerticalOffset="-4"
|
||||||
WindowManagerAddShadowHint="False">
|
WindowManagerAddShadowHint="False">
|
||||||
<Border
|
<Border
|
||||||
MinWidth="{DynamicResource MenuFlyoutMinWidth}"
|
MinWidth="{DynamicResource MenuFlyoutMinWidth}"
|
||||||
MinHeight="{DynamicResource MenuFlyoutMinHeight}"
|
MinHeight="{DynamicResource MenuFlyoutMinHeight}"
|
||||||
MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
|
MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
|
||||||
MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
|
MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
|
||||||
Margin="4"
|
Margin="8"
|
||||||
Padding="{DynamicResource MenuFlyoutPadding}"
|
Padding="{DynamicResource MenuFlyoutPadding}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Background="{DynamicResource MenuFlyoutBackground}"
|
Background="{DynamicResource MenuFlyoutBackground}"
|
||||||
@ -274,17 +275,19 @@
|
|||||||
<Popup
|
<Popup
|
||||||
Name="PART_Popup"
|
Name="PART_Popup"
|
||||||
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
|
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
|
||||||
|
HorizontalOffset="-8"
|
||||||
IsLightDismissEnabled="True"
|
IsLightDismissEnabled="True"
|
||||||
IsOpen="{TemplateBinding IsSubMenuOpen,
|
IsOpen="{TemplateBinding IsSubMenuOpen,
|
||||||
Mode=TwoWay}"
|
Mode=TwoWay}"
|
||||||
OverlayInputPassThroughElement="{Binding $parent[Menu]}"
|
OverlayInputPassThroughElement="{Binding $parent[Menu]}"
|
||||||
|
VerticalOffset="-4"
|
||||||
WindowManagerAddShadowHint="False">
|
WindowManagerAddShadowHint="False">
|
||||||
<Border
|
<Border
|
||||||
MinWidth="{DynamicResource MenuFlyoutMinWidth}"
|
MinWidth="{DynamicResource MenuFlyoutMinWidth}"
|
||||||
MinHeight="{DynamicResource MenuFlyoutMinHeight}"
|
MinHeight="{DynamicResource MenuFlyoutMinHeight}"
|
||||||
MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
|
MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
|
||||||
MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
|
MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
|
||||||
Margin="4"
|
Margin="8"
|
||||||
Padding="{DynamicResource MenuFlyoutPadding}"
|
Padding="{DynamicResource MenuFlyoutPadding}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Background="{DynamicResource MenuFlyoutBackground}"
|
Background="{DynamicResource MenuFlyoutBackground}"
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
MinHeight="{DynamicResource MenuFlyoutMinHeight}"
|
MinHeight="{DynamicResource MenuFlyoutMinHeight}"
|
||||||
MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
|
MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
|
||||||
MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
|
MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
|
||||||
Margin="0,4"
|
Margin="8"
|
||||||
Padding="{DynamicResource MenuFlyoutPadding}"
|
Padding="{DynamicResource MenuFlyoutPadding}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Background="{DynamicResource MenuFlyoutBackground}"
|
Background="{DynamicResource MenuFlyoutBackground}"
|
||||||
|
@ -18,8 +18,8 @@
|
|||||||
<ControlTemplate TargetType="NotificationCard">
|
<ControlTemplate TargetType="NotificationCard">
|
||||||
<LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
|
<LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
|
||||||
<Border
|
<Border
|
||||||
Margin="4"
|
Margin="8"
|
||||||
BoxShadow="0 0 14 #1A000000"
|
BoxShadow="0 0 8 0 #1A000000"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}">
|
CornerRadius="{TemplateBinding CornerRadius}">
|
||||||
<Border
|
<Border
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
|
@ -18,6 +18,28 @@
|
|||||||
Theme="{StaticResource BorderlessTextBox}" />
|
Theme="{StaticResource BorderlessTextBox}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Design.PreviewWith>
|
</Design.PreviewWith>
|
||||||
|
|
||||||
|
<MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
|
||||||
|
<MenuItem
|
||||||
|
x:Name="TextBoxContextFlyoutCutItem"
|
||||||
|
Command="{Binding $parent[TextBox].Cut}"
|
||||||
|
Header="Cut"
|
||||||
|
InputGesture="{x:Static TextBox.CutGesture}"
|
||||||
|
IsEnabled="{Binding $parent[TextBox].CanCut}" />
|
||||||
|
<MenuItem
|
||||||
|
x:Name="TextBoxContextFlyoutCopyItem"
|
||||||
|
Command="{Binding $parent[TextBox].Copy}"
|
||||||
|
Header="Copy"
|
||||||
|
InputGesture="{x:Static TextBox.CopyGesture}"
|
||||||
|
IsEnabled="{Binding $parent[TextBox].CanCopy}" />
|
||||||
|
<MenuItem
|
||||||
|
x:Name="TextBoxContextFlyoutPasteItem"
|
||||||
|
Command="{Binding $parent[TextBox].Paste}"
|
||||||
|
Header="Paste"
|
||||||
|
InputGesture="{x:Static TextBox.PasteGesture}"
|
||||||
|
IsEnabled="{Binding $parent[TextBox].CanPaste}" />
|
||||||
|
</MenuFlyout>
|
||||||
|
|
||||||
<ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
|
<ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
|
||||||
<ControlTheme.Resources>
|
<ControlTheme.Resources>
|
||||||
<ControlTheme x:Key="InputClearButton" TargetType="Button">
|
<ControlTheme x:Key="InputClearButton" TargetType="Button">
|
||||||
@ -77,6 +99,7 @@
|
|||||||
<Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
|
<Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
|
<Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
|
||||||
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
|
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
|
||||||
|
<Setter Property="TextBox.ContextFlyout" Value="{StaticResource DefaultTextBoxContextFlyout}" />
|
||||||
<Setter Property="TextBox.Template">
|
<Setter Property="TextBox.Template">
|
||||||
<ControlTemplate TargetType="TextBox">
|
<ControlTemplate TargetType="TextBox">
|
||||||
<Border
|
<Border
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="White" />
|
<SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="White" />
|
||||||
<SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
|
<SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
|
||||||
<Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
|
<Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
|
||||||
<Thickness x:Key="AutoCompleteBoxPopupMargin">0 4</Thickness>
|
<Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
|
||||||
<CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
|
<CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
|
||||||
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#2E3238" />
|
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#2E3238" />
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
<ResourceDictionary
|
||||||
|
xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:sys="using:System">
|
||||||
<!-- Add Resources Here -->
|
<!-- Add Resources Here -->
|
||||||
<SolidColorBrush x:Key="CalendarBackground" Color="White" />
|
<SolidColorBrush x:Key="CalendarBackground" Color="White" />
|
||||||
<SolidColorBrush x:Key="CalendarForeground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="CalendarForeground" Color="#1C1F23" />
|
||||||
@ -43,4 +46,5 @@
|
|||||||
<SolidColorBrush x:Key="CalendarItemCalendarDayButtonBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
|
<SolidColorBrush x:Key="CalendarItemCalendarDayButtonBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="CalendarItemCalendarDayButtonInactiveForeground" Opacity="0.62" Color="#1C1F23" />
|
<SolidColorBrush x:Key="CalendarItemCalendarDayButtonInactiveForeground" Opacity="0.62" Color="#1C1F23" />
|
||||||
|
|
||||||
|
<sys:Double x:Key="CalendarMinWidth">240</sys:Double>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
<Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
|
<Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
|
||||||
<Thickness x:Key="MenuFlyoutPadding">0 4</Thickness>
|
<Thickness x:Key="MenuFlyoutPadding">0 4</Thickness>
|
||||||
<BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
|
<BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
|
||||||
<CornerRadius x:Key="MenuFlyoutCornerRadius">3</CornerRadius>
|
<CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
|
||||||
<sys:Double x:Key="MenuFlyoutMinHeight">16</sys:Double>
|
<sys:Double x:Key="MenuFlyoutMinHeight">16</sys:Double>
|
||||||
<sys:Double x:Key="MenuFlyoutMinWidth">100</sys:Double>
|
<sys:Double x:Key="MenuFlyoutMinWidth">100</sys:Double>
|
||||||
<sys:Double x:Key="MenuFlyoutMaxHeight">400</sys:Double>
|
<sys:Double x:Key="MenuFlyoutMaxHeight">400</sys:Double>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user