Add CanResize property to drawers and dialogs with corresponding UI controls
This commit introduces a new `CanResize` property to `DrawerOptions`, `OverlayDialogOptions`, and their respective controls. It also adds UI resizing functionality through the `DialogResizer` control, with styles adjusted to support different drawer positions. Code formatting and organization have been improved for readability across modified files.
This commit is contained in:
rabbitism
@@ -1,154 +1,60 @@
|
|||||||
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
<ResourceDictionary
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:u="https://irihi.tech/ursa"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:c="clr-namespace:Ursa.Themes.Semi.Converters">
|
xmlns:c="clr-namespace:Ursa.Themes.Semi.Converters"
|
||||||
<ControlTheme TargetType="u:CustomDrawerControl" x:Key="{x:Type u:CustomDrawerControl}">
|
xmlns:u="https://irihi.tech/ursa">
|
||||||
<Setter Property="VerticalAlignment" Value="Stretch"></Setter>
|
<ControlTheme x:Key="{x:Type u:CustomDrawerControl}" TargetType="u:CustomDrawerControl">
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
|
<Setter Property="VerticalAlignment" Value="Stretch" />
|
||||||
<Setter Property="Padding" Value="{DynamicResource DrawerMargin}"/>
|
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
||||||
<Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}"/>
|
<Setter Property="MinWidth" Value="96" />
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}"/>
|
<Setter Property="MinHeight" Value="96" />
|
||||||
|
<Setter Property="Padding" Value="{DynamicResource DrawerMargin}" />
|
||||||
|
<Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}" />
|
||||||
|
<Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}" />
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="u:CustomDrawerControl">
|
<ControlTemplate TargetType="u:CustomDrawerControl">
|
||||||
<Border Name="PART_Root"
|
<Panel>
|
||||||
Focusable="True"
|
<Border
|
||||||
Margin="{TemplateBinding Padding, Converter={x:Static c:ThicknessTakeConverter.Left}}"
|
Name="PART_Root"
|
||||||
|
Margin="{TemplateBinding Padding,
|
||||||
|
Converter={x:Static c:ThicknessTakeConverter.Left}}"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
|
BorderThickness="{TemplateBinding BorderThickness,
|
||||||
|
Converter={x:Static c:ThicknessTakeConverter.Left}}"
|
||||||
Classes="Shadow"
|
Classes="Shadow"
|
||||||
ClipToBounds="False"
|
ClipToBounds="False"
|
||||||
CornerRadius="{TemplateBinding CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Left}}"
|
CornerRadius="{TemplateBinding CornerRadius,
|
||||||
BorderThickness="{TemplateBinding BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Left}}"
|
Converter={x:Static c:CornerRadiusTakeConverter.Left}}"
|
||||||
IsHitTestVisible="True"
|
|
||||||
Theme="{DynamicResource CardBorder}">
|
|
||||||
<Border ClipToBounds="True" CornerRadius="{Binding #PART_Root.CornerRadius}">
|
|
||||||
<Grid RowDefinitions="Auto, *">
|
|
||||||
<ContentPresenter
|
|
||||||
Name="PART_ContentPresenter"
|
|
||||||
Grid.Row="0"
|
|
||||||
Grid.RowSpan="2"
|
|
||||||
Content="{TemplateBinding Content}" />
|
|
||||||
<Grid Grid.Row="0" ColumnDefinitions="*, Auto">
|
|
||||||
<Panel
|
|
||||||
Name="{x:Static u:DialogControlBase.PART_TitleArea}"
|
|
||||||
Grid.Column="0"
|
|
||||||
Grid.ColumnSpan="2"
|
|
||||||
Background="Transparent" />
|
|
||||||
<Button
|
|
||||||
Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
|
|
||||||
Grid.Column="1"
|
|
||||||
Margin="0,24,24,0"
|
|
||||||
DockPanel.Dock="Right"
|
|
||||||
Theme="{DynamicResource OverlayCloseButton}" />
|
|
||||||
</Grid>
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
|
||||||
</Border>
|
|
||||||
</ControlTemplate>
|
|
||||||
</Setter>
|
|
||||||
<Style Selector="^[Position=Right] /template/ Border#PART_Root">
|
|
||||||
<Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Left}}" />
|
|
||||||
<Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Left}}" />
|
|
||||||
<Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Left}}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^[Position=Left] /template/ Border#PART_Root">
|
|
||||||
<Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Right}}" />
|
|
||||||
<Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Right}}" />
|
|
||||||
<Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Right}}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^[Position=Top] /template/ Border#PART_Root">
|
|
||||||
<Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Bottom}}" />
|
|
||||||
<Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Bottom}}" />
|
|
||||||
<Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Bottom}}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^[Position=Bottom] /template/ Border#PART_Root">
|
|
||||||
<Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Top}}" />
|
|
||||||
<Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Top}}" />
|
|
||||||
<Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Top}}" />
|
|
||||||
</Style>
|
|
||||||
</ControlTheme>
|
|
||||||
|
|
||||||
<ControlTheme x:Key="{x:Type u:DefaultDrawerControl}" TargetType="u:DefaultDrawerControl">
|
|
||||||
<Setter Property="VerticalAlignment" Value="Stretch"></Setter>
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
|
|
||||||
<Setter Property="Padding" Value="{DynamicResource DrawerMargin}"/>
|
|
||||||
<Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}"/>
|
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}"/>
|
|
||||||
<Setter Property="Template">
|
|
||||||
<ControlTemplate TargetType="u:DefaultDrawerControl">
|
|
||||||
<Border Name="PART_Root"
|
|
||||||
Focusable="True"
|
Focusable="True"
|
||||||
Margin="{TemplateBinding Padding, Converter={x:Static c:ThicknessTakeConverter.Left}}"
|
|
||||||
Padding="0"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
Classes="Shadow"
|
|
||||||
ClipToBounds="False"
|
|
||||||
CornerRadius="{TemplateBinding CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Left}}"
|
|
||||||
BorderThickness="{TemplateBinding BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Left}}"
|
|
||||||
IsHitTestVisible="True"
|
IsHitTestVisible="True"
|
||||||
Theme="{DynamicResource CardBorder}">
|
Theme="{DynamicResource CardBorder}">
|
||||||
<Border ClipToBounds="True" CornerRadius="{Binding #PART_Root.CornerRadius}">
|
<Border ClipToBounds="True" CornerRadius="{Binding #PART_Root.CornerRadius}">
|
||||||
<Grid RowDefinitions="Auto, *, Auto">
|
<Grid RowDefinitions="Auto, *">
|
||||||
<ScrollViewer Grid.Row="1">
|
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
Name="PART_ContentPresenter"
|
Name="PART_ContentPresenter"
|
||||||
Margin="24,8"
|
Grid.Row="0"
|
||||||
|
Grid.RowSpan="2"
|
||||||
Content="{TemplateBinding Content}" />
|
Content="{TemplateBinding Content}" />
|
||||||
</ScrollViewer>
|
<Grid Grid.Row="0" ColumnDefinitions="*, Auto">
|
||||||
<Grid Grid.Row="0" ColumnDefinitions=" *, Auto">
|
<Panel
|
||||||
<TextBlock
|
Name="{x:Static u:DialogControlBase.PART_TitleArea}"
|
||||||
Name="PART_Title"
|
Grid.Column="0"
|
||||||
Grid.Column="0"
|
Grid.ColumnSpan="2"
|
||||||
Margin="24,24,0,0"
|
Background="Transparent" />
|
||||||
VerticalAlignment="Center"
|
<Button
|
||||||
FontSize="16"
|
Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
|
||||||
FontWeight="{DynamicResource TextBlockTitleFontWeight}"
|
Grid.Column="1"
|
||||||
IsHitTestVisible="False"
|
Margin="0,24,24,0"
|
||||||
IsVisible="{TemplateBinding Title,
|
DockPanel.Dock="Right"
|
||||||
Converter={x:Static ObjectConverters.IsNotNull}}"
|
Theme="{DynamicResource OverlayCloseButton}" />
|
||||||
Text="{TemplateBinding Title}"
|
</Grid>
|
||||||
TextWrapping="Wrap" />
|
|
||||||
<Button
|
|
||||||
Name="{x:Static u:DrawerControlBase.PART_CloseButton}"
|
|
||||||
Grid.Column="1"
|
|
||||||
Margin="0,24,24,0"
|
|
||||||
DockPanel.Dock="Right"
|
|
||||||
Theme="{DynamicResource OverlayCloseButton}" />
|
|
||||||
</Grid>
|
</Grid>
|
||||||
<StackPanel
|
</Border>
|
||||||
Grid.Row="2"
|
|
||||||
Margin="24,0,24,24"
|
|
||||||
HorizontalAlignment="Right"
|
|
||||||
Orientation="Horizontal">
|
|
||||||
<Button
|
|
||||||
Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
|
|
||||||
Margin="8,0,0,0"
|
|
||||||
Classes="Tertiary"
|
|
||||||
Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
|
|
||||||
<Button
|
|
||||||
Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
|
|
||||||
Margin="8,0,0,0"
|
|
||||||
Classes="Danger"
|
|
||||||
Content="{DynamicResource STRING_MENU_DIALOG_NO}"
|
|
||||||
Theme="{DynamicResource SolidButton}" />
|
|
||||||
<Button
|
|
||||||
Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
|
|
||||||
Margin="8,0,0,0"
|
|
||||||
Classes="Primary"
|
|
||||||
Content="{DynamicResource STRING_MENU_DIALOG_YES}"
|
|
||||||
Theme="{DynamicResource SolidButton}" />
|
|
||||||
<Button
|
|
||||||
Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
|
|
||||||
Margin="8,0,0,0"
|
|
||||||
Classes="Primary"
|
|
||||||
Content="{DynamicResource STRING_MENU_DIALOG_OK}"
|
|
||||||
Theme="{DynamicResource SolidButton}" />
|
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
</Border>
|
||||||
</Border>
|
<u:DialogResizer IsVisible="{TemplateBinding CanResize}" />
|
||||||
|
</Panel>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
<Style Selector="^[Position=Right] /template/ Border#PART_Root">
|
<Style Selector="^[Position=Right] /template/ Border#PART_Root">
|
||||||
@@ -171,5 +77,142 @@
|
|||||||
<Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Top}}" />
|
<Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Top}}" />
|
||||||
<Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Top}}" />
|
<Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Top}}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
<Style Selector="^[Position=Top] /template/ u|DialogResizer">
|
||||||
|
<Setter Property="ResizeDirection" Value="Bottom"/>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^[Position=Bottom] /template/ u|DialogResizer">
|
||||||
|
<Setter Property="ResizeDirection" Value="Top"/>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^[Position=Left] /template/ u|DialogResizer">
|
||||||
|
<Setter Property="ResizeDirection" Value="Right"/>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^[Position=Right] /template/ u|DialogResizer">
|
||||||
|
<Setter Property="ResizeDirection" Value="Left"/>
|
||||||
|
</Style>
|
||||||
|
</ControlTheme>
|
||||||
|
|
||||||
|
<ControlTheme x:Key="{x:Type u:DefaultDrawerControl}" TargetType="u:DefaultDrawerControl">
|
||||||
|
<Setter Property="VerticalAlignment" Value="Stretch" />
|
||||||
|
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
||||||
|
<Setter Property="MinWidth" Value="96" />
|
||||||
|
<Setter Property="MinHeight" Value="96" />
|
||||||
|
<Setter Property="Padding" Value="{DynamicResource DrawerMargin}" />
|
||||||
|
<Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}" />
|
||||||
|
<Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}" />
|
||||||
|
<Setter Property="Template">
|
||||||
|
<ControlTemplate TargetType="u:DefaultDrawerControl">
|
||||||
|
<Panel>
|
||||||
|
<Border
|
||||||
|
Name="PART_Root"
|
||||||
|
Margin="{TemplateBinding Padding,
|
||||||
|
Converter={x:Static c:ThicknessTakeConverter.Left}}"
|
||||||
|
Padding="0"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
BorderThickness="{TemplateBinding BorderThickness,
|
||||||
|
Converter={x:Static c:ThicknessTakeConverter.Left}}"
|
||||||
|
Classes="Shadow"
|
||||||
|
ClipToBounds="False"
|
||||||
|
CornerRadius="{TemplateBinding CornerRadius,
|
||||||
|
Converter={x:Static c:CornerRadiusTakeConverter.Left}}"
|
||||||
|
Focusable="True"
|
||||||
|
IsHitTestVisible="True"
|
||||||
|
Theme="{DynamicResource CardBorder}">
|
||||||
|
<Border ClipToBounds="True" CornerRadius="{Binding #PART_Root.CornerRadius}">
|
||||||
|
<Grid RowDefinitions="Auto, *, Auto">
|
||||||
|
<ScrollViewer Grid.Row="1">
|
||||||
|
<ContentPresenter
|
||||||
|
Name="PART_ContentPresenter"
|
||||||
|
Margin="24,8"
|
||||||
|
Content="{TemplateBinding Content}" />
|
||||||
|
</ScrollViewer>
|
||||||
|
<Grid Grid.Row="0" ColumnDefinitions=" *, Auto">
|
||||||
|
<TextBlock
|
||||||
|
Name="PART_Title"
|
||||||
|
Grid.Column="0"
|
||||||
|
Margin="24,24,0,0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
FontSize="16"
|
||||||
|
FontWeight="{DynamicResource TextBlockTitleFontWeight}"
|
||||||
|
IsHitTestVisible="False"
|
||||||
|
IsVisible="{TemplateBinding Title,
|
||||||
|
Converter={x:Static ObjectConverters.IsNotNull}}"
|
||||||
|
Text="{TemplateBinding Title}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<Button
|
||||||
|
Name="{x:Static u:DrawerControlBase.PART_CloseButton}"
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="0,24,24,0"
|
||||||
|
DockPanel.Dock="Right"
|
||||||
|
Theme="{DynamicResource OverlayCloseButton}" />
|
||||||
|
</Grid>
|
||||||
|
<StackPanel
|
||||||
|
Grid.Row="2"
|
||||||
|
Margin="24,0,24,24"
|
||||||
|
HorizontalAlignment="Right"
|
||||||
|
Orientation="Horizontal">
|
||||||
|
<Button
|
||||||
|
Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
|
||||||
|
Margin="8,0,0,0"
|
||||||
|
Classes="Tertiary"
|
||||||
|
Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
|
||||||
|
<Button
|
||||||
|
Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
|
||||||
|
Margin="8,0,0,0"
|
||||||
|
Classes="Danger"
|
||||||
|
Content="{DynamicResource STRING_MENU_DIALOG_NO}"
|
||||||
|
Theme="{DynamicResource SolidButton}" />
|
||||||
|
<Button
|
||||||
|
Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
|
||||||
|
Margin="8,0,0,0"
|
||||||
|
Classes="Primary"
|
||||||
|
Content="{DynamicResource STRING_MENU_DIALOG_YES}"
|
||||||
|
Theme="{DynamicResource SolidButton}" />
|
||||||
|
<Button
|
||||||
|
Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
|
||||||
|
Margin="8,0,0,0"
|
||||||
|
Classes="Primary"
|
||||||
|
Content="{DynamicResource STRING_MENU_DIALOG_OK}"
|
||||||
|
Theme="{DynamicResource SolidButton}" />
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</Border>
|
||||||
|
<u:DialogResizer IsVisible="{TemplateBinding CanResize}" />
|
||||||
|
</Panel>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter>
|
||||||
|
<Style Selector="^[Position=Right] /template/ Border#PART_Root">
|
||||||
|
<Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Left}}" />
|
||||||
|
<Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Left}}" />
|
||||||
|
<Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Left}}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^[Position=Left] /template/ Border#PART_Root">
|
||||||
|
<Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Right}}" />
|
||||||
|
<Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Right}}" />
|
||||||
|
<Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Right}}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^[Position=Top] /template/ Border#PART_Root">
|
||||||
|
<Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Bottom}}" />
|
||||||
|
<Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Bottom}}" />
|
||||||
|
<Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Bottom}}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^[Position=Bottom] /template/ Border#PART_Root">
|
||||||
|
<Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Top}}" />
|
||||||
|
<Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Top}}" />
|
||||||
|
<Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Top}}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^[Position=Top] /template/ u|DialogResizer">
|
||||||
|
<Setter Property="ResizeDirection" Value="Bottom"/>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^[Position=Bottom] /template/ u|DialogResizer">
|
||||||
|
<Setter Property="ResizeDirection" Value="Top"/>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^[Position=Left] /template/ u|DialogResizer">
|
||||||
|
<Setter Property="ResizeDirection" Value="Right"/>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^[Position=Right] /template/ u|DialogResizer">
|
||||||
|
<Setter Property="ResizeDirection" Value="Left"/>
|
||||||
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -1,57 +1,144 @@
|
|||||||
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
<ResourceDictionary
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:u="https://irihi.tech/ursa"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:iri="https://irihi.tech/shared">
|
xmlns:iri="https://irihi.tech/shared"
|
||||||
<!-- Add Resources Here -->
|
xmlns:u="https://irihi.tech/ursa">
|
||||||
<ControlTheme TargetType="u:WindowResizerThumb" x:Key="{x:Type u:WindowResizerThumb}">
|
<!-- Add Resources Here -->
|
||||||
|
<ControlTheme x:Key="{x:Type u:WindowResizerThumb}" TargetType="u:WindowResizerThumb">
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Background" Value="Transparent" />
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="u:WindowResizerThumb">
|
<ControlTemplate TargetType="u:WindowResizerThumb">
|
||||||
<iri:PureRectangle HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="{TemplateBinding Background}"/>
|
<iri:PureRectangle
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
Background="{TemplateBinding Background}" />
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
<ControlTheme TargetType="u:DialogResizerThumb" x:Key="{x:Type u:DialogResizerThumb}">
|
<ControlTheme x:Key="{x:Type u:DialogResizerThumb}" TargetType="u:DialogResizerThumb">
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Background" Value="Transparent" />
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="u:DialogResizerThumb">
|
<ControlTemplate TargetType="u:DialogResizerThumb">
|
||||||
<Panel>
|
<Panel>
|
||||||
<iri:PureRectangle HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="{TemplateBinding Background}"/>
|
<iri:PureRectangle
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
Background="{TemplateBinding Background}" />
|
||||||
</Panel>
|
</Panel>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
<ControlTheme TargetType="u:DialogResizer" x:Key="{x:Type u:DialogResizer}">
|
<ControlTheme x:Key="{x:Type u:DialogResizer}" TargetType="u:DialogResizer">
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="u:WindowResizer">
|
<ControlTemplate TargetType="u:WindowResizer">
|
||||||
<Grid RowDefinitions="Auto, *, Auto" ColumnDefinitions="Auto, *, Auto" >
|
<Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="Auto, *, Auto">
|
||||||
<u:DialogResizerThumb Grid.Row="0" Grid.Column="0" ResizeDirection="TopLeft" Cursor="TopLeftCorner" />
|
<u:DialogResizerThumb
|
||||||
<u:DialogResizerThumb Grid.Row="0" Grid.Column="1" ResizeDirection="Top" Cursor="TopSide" Height="{DynamicResource ResizerThumbHeight}" />
|
Name="{x:Static u:DialogResizer.PART_TopLeft}"
|
||||||
<u:DialogResizerThumb Grid.Row="0" Grid.Column="2" ResizeDirection="TopRight" Cursor="TopRightCorner" />
|
Grid.Row="0"
|
||||||
<u:DialogResizerThumb Grid.Row="1" Grid.Column="0" ResizeDirection="Left" Cursor="LeftSide" Width="{DynamicResource ResizerThumbWidth}" />
|
Grid.Column="0"
|
||||||
<u:DialogResizerThumb Grid.Row="1" Grid.Column="2" ResizeDirection="Right" Cursor="RightSide" Width="{DynamicResource ResizerThumbWidth}" />
|
Cursor="TopLeftCorner"
|
||||||
<u:DialogResizerThumb Grid.Row="2" Grid.Column="0" ResizeDirection="BottomLeft" Cursor="BottomLeftCorner" />
|
ResizeDirection="TopLeft" />
|
||||||
<u:DialogResizerThumb Grid.Row="2" Grid.Column="1" ResizeDirection="Bottom" Cursor="BottomSide" Height="{DynamicResource ResizerThumbHeight}" />
|
<u:DialogResizerThumb
|
||||||
<u:DialogResizerThumb Grid.Row="2" Grid.Column="2" ResizeDirection="BottomRight" Cursor="BottomRightCorner" />
|
Name="{x:Static u:DialogResizer.PART_Top}"
|
||||||
|
Grid.Row="0"
|
||||||
|
Grid.Column="1"
|
||||||
|
Height="{DynamicResource ResizerThumbHeight}"
|
||||||
|
Cursor="TopSide"
|
||||||
|
ResizeDirection="Top" />
|
||||||
|
<u:DialogResizerThumb
|
||||||
|
Name="{x:Static u:DialogResizer.PART_TopRight}"
|
||||||
|
Grid.Row="0"
|
||||||
|
Grid.Column="2"
|
||||||
|
Cursor="TopRightCorner"
|
||||||
|
ResizeDirection="TopRight" />
|
||||||
|
<u:DialogResizerThumb
|
||||||
|
Name="{x:Static u:DialogResizer.PART_Left}"
|
||||||
|
Grid.Row="1"
|
||||||
|
Grid.Column="0"
|
||||||
|
Width="{DynamicResource ResizerThumbWidth}"
|
||||||
|
Cursor="LeftSide"
|
||||||
|
ResizeDirection="Left" />
|
||||||
|
<u:DialogResizerThumb
|
||||||
|
Name="{x:Static u:DialogResizer.PART_Right}"
|
||||||
|
Grid.Row="1"
|
||||||
|
Grid.Column="2"
|
||||||
|
Width="{DynamicResource ResizerThumbWidth}"
|
||||||
|
Cursor="RightSide"
|
||||||
|
ResizeDirection="Right" />
|
||||||
|
<u:DialogResizerThumb
|
||||||
|
Name="{x:Static u:DialogResizer.PART_BottomLeft}"
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="0"
|
||||||
|
Cursor="BottomLeftCorner"
|
||||||
|
ResizeDirection="BottomLeft" />
|
||||||
|
<u:DialogResizerThumb
|
||||||
|
Name="{x:Static u:DialogResizer.PART_Bottom}"
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="1"
|
||||||
|
Height="{DynamicResource ResizerThumbHeight}"
|
||||||
|
Cursor="BottomSide"
|
||||||
|
ResizeDirection="Bottom" />
|
||||||
|
<u:DialogResizerThumb
|
||||||
|
Name="{x:Static u:DialogResizer.PART_BottomRight}"
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="2"
|
||||||
|
Cursor="BottomRightCorner"
|
||||||
|
ResizeDirection="BottomRight" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
<ControlTheme TargetType="u:WindowResizer" x:Key="{x:Type u:WindowResizer}">
|
<ControlTheme x:Key="{x:Type u:WindowResizer}" TargetType="u:WindowResizer">
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="u:WindowResizer">
|
<ControlTemplate TargetType="u:WindowResizer">
|
||||||
<Grid RowDefinitions="Auto, *, Auto" ColumnDefinitions="Auto, *, Auto" >
|
<Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="Auto, *, Auto">
|
||||||
<u:WindowResizerThumb Grid.Row="0" Grid.Column="0" ResizeDirection="TopLeft" Cursor="TopLeftCorner" />
|
<u:WindowResizerThumb
|
||||||
<u:WindowResizerThumb Grid.Row="0" Grid.Column="1" ResizeDirection="Top" Cursor="TopSide" Height="{DynamicResource ResizerThumbHeight}" />
|
Grid.Row="0"
|
||||||
<u:WindowResizerThumb Grid.Row="0" Grid.Column="2" ResizeDirection="TopRight" Cursor="TopRightCorner" />
|
Grid.Column="0"
|
||||||
<u:WindowResizerThumb Grid.Row="1" Grid.Column="0" ResizeDirection="Left" Cursor="LeftSide" Width="{DynamicResource ResizerThumbWidth}" />
|
Cursor="TopLeftCorner"
|
||||||
<u:WindowResizerThumb Grid.Row="1" Grid.Column="2" ResizeDirection="Right" Cursor="RightSide" Width="{DynamicResource ResizerThumbWidth}" />
|
ResizeDirection="TopLeft" />
|
||||||
<u:WindowResizerThumb Grid.Row="2" Grid.Column="0" ResizeDirection="BottomLeft" Cursor="BottomLeftCorner" />
|
<u:WindowResizerThumb
|
||||||
<u:WindowResizerThumb Grid.Row="2" Grid.Column="1" ResizeDirection="Bottom" Cursor="BottomSide" Height="{DynamicResource ResizerThumbHeight}" />
|
Grid.Row="0"
|
||||||
<u:WindowResizerThumb Grid.Row="2" Grid.Column="2" ResizeDirection="BottomRight" Cursor="BottomRightCorner" />
|
Grid.Column="1"
|
||||||
|
Height="{DynamicResource ResizerThumbHeight}"
|
||||||
|
Cursor="TopSide"
|
||||||
|
ResizeDirection="Top" />
|
||||||
|
<u:WindowResizerThumb
|
||||||
|
Grid.Row="0"
|
||||||
|
Grid.Column="2"
|
||||||
|
Cursor="TopRightCorner"
|
||||||
|
ResizeDirection="TopRight" />
|
||||||
|
<u:WindowResizerThumb
|
||||||
|
Grid.Row="1"
|
||||||
|
Grid.Column="0"
|
||||||
|
Width="{DynamicResource ResizerThumbWidth}"
|
||||||
|
Cursor="LeftSide"
|
||||||
|
ResizeDirection="Left" />
|
||||||
|
<u:WindowResizerThumb
|
||||||
|
Grid.Row="1"
|
||||||
|
Grid.Column="2"
|
||||||
|
Width="{DynamicResource ResizerThumbWidth}"
|
||||||
|
Cursor="RightSide"
|
||||||
|
ResizeDirection="Right" />
|
||||||
|
<u:WindowResizerThumb
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="0"
|
||||||
|
Cursor="BottomLeftCorner"
|
||||||
|
ResizeDirection="BottomLeft" />
|
||||||
|
<u:WindowResizerThumb
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="1"
|
||||||
|
Height="{DynamicResource ResizerThumbHeight}"
|
||||||
|
Cursor="BottomSide"
|
||||||
|
ResizeDirection="Bottom" />
|
||||||
|
<u:WindowResizerThumb
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="2"
|
||||||
|
Cursor="BottomRightCorner"
|
||||||
|
ResizeDirection="BottomRight" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
|
|||||||
@@ -205,16 +205,17 @@ public static class Drawer
|
|||||||
drawer.Position = options.Position;
|
drawer.Position = options.Position;
|
||||||
drawer.IsCloseButtonVisible = options.IsCloseButtonVisible;
|
drawer.IsCloseButtonVisible = options.IsCloseButtonVisible;
|
||||||
drawer.CanLightDismiss = options.CanLightDismiss;
|
drawer.CanLightDismiss = options.CanLightDismiss;
|
||||||
|
drawer.CanResize = options.CanResize;
|
||||||
if (options.Position == Position.Left || options.Position == Position.Right)
|
if (options.Position == Position.Left || options.Position == Position.Right)
|
||||||
{
|
{
|
||||||
drawer.MinWidth = options.MinWidth ?? 0.0;
|
if(options.MinWidth is not null) drawer.MinWidth = options.MinWidth.Value;
|
||||||
drawer.MaxWidth = options.MaxWidth ?? double.PositiveInfinity;
|
if(options.MaxWidth is not null) drawer.MaxWidth = options.MaxWidth.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.Position is Position.Top or Position.Bottom)
|
if (options.Position is Position.Top or Position.Bottom)
|
||||||
{
|
{
|
||||||
drawer.MinHeight = options.MinHeight ?? 0.0;
|
if(options.MinHeight is not null) drawer.MinHeight = options.MinHeight.Value;
|
||||||
drawer.MaxHeight = options.MaxHeight ?? double.PositiveInfinity;
|
if(options.MaxHeight is not null) drawer.MaxHeight = options.MaxHeight.Value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,16 +227,17 @@ public static class Drawer
|
|||||||
drawer.CanLightDismiss = options.CanLightDismiss;
|
drawer.CanLightDismiss = options.CanLightDismiss;
|
||||||
drawer.Buttons = options.Buttons;
|
drawer.Buttons = options.Buttons;
|
||||||
drawer.Title = options.Title;
|
drawer.Title = options.Title;
|
||||||
|
drawer.CanResize = options.CanResize;
|
||||||
if (options.Position == Position.Left || options.Position == Position.Right)
|
if (options.Position == Position.Left || options.Position == Position.Right)
|
||||||
{
|
{
|
||||||
drawer.MinWidth = options.MinWidth ?? 0.0;
|
if(options.MinWidth is not null) drawer.MinWidth = options.MinWidth.Value;
|
||||||
drawer.MaxWidth = options.MaxWidth ?? double.PositiveInfinity;
|
if(options.MaxWidth is not null) drawer.MaxWidth = options.MaxWidth.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.Position is Position.Top or Position.Bottom)
|
if (options.Position is Position.Top or Position.Bottom)
|
||||||
{
|
{
|
||||||
drawer.MinHeight = options.MinHeight ?? 0.0;
|
if(options.MinHeight is not null) drawer.MinHeight = options.MinHeight.Value;
|
||||||
drawer.MaxHeight = options.MaxHeight ?? double.PositiveInfinity;
|
if(options.MaxHeight is not null) drawer.MaxHeight = options.MaxHeight.Value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -22,6 +22,15 @@ public abstract class DrawerControlBase: OverlayFeedbackElement
|
|||||||
AvaloniaProperty.Register<DrawerControlBase, Position>(
|
AvaloniaProperty.Register<DrawerControlBase, Position>(
|
||||||
nameof(Position), defaultValue: Position.Right);
|
nameof(Position), defaultValue: Position.Right);
|
||||||
|
|
||||||
|
public static readonly StyledProperty<bool> CanResizeProperty = AvaloniaProperty.Register<DrawerControlBase, bool>(
|
||||||
|
nameof(CanResize));
|
||||||
|
|
||||||
|
public bool CanResize
|
||||||
|
{
|
||||||
|
get => GetValue(CanResizeProperty);
|
||||||
|
set => SetValue(CanResizeProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
public Position Position
|
public Position Position
|
||||||
{
|
{
|
||||||
get => GetValue(PositionProperty);
|
get => GetValue(PositionProperty);
|
||||||
|
|||||||
@@ -20,4 +20,6 @@ public class DrawerOptions
|
|||||||
/// The hash code of the top level dialog host. This is used to identify the dialog host if there are multiple dialog hosts with the same id. If this is not provided, the dialog will be added to the first dialog host with the same id.
|
/// The hash code of the top level dialog host. This is used to identify the dialog host if there are multiple dialog hosts with the same id. If this is not provided, the dialog will be added to the first dialog host with the same id.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? TopLevelHashCode { get; set; }
|
public int? TopLevelHashCode { get; set; }
|
||||||
|
|
||||||
|
public bool CanResize { get; set; }
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user