chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: set MinWidth and MinHeight for all Dialogs.

Browse Source
This commit is contained in:
rabbitism
2024-09-18 15:38:05 +08:00
parent c712a9faa5
commit 10568e8c9e
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Ursa.Themes.Semi/Controls/Dialog.axaml
View File

@@ -9,8 +9,8 @@
</ControlTheme>
<ControlTheme x:Key="{x:Type u:CustomDialogControl}" TargetType="u:CustomDialogControl">
<Setter Property="MinWidth" Value="96" />
<Setter Property="MinHeight" Value="96" />
<Setter Property="MinWidth" Value="{DynamicResource DialogMinWidth}"/>
<Setter Property="MinHeight" Value="{DynamicResource DialogMinHeight}"/>
<Setter Property="CornerRadius" Value="{DynamicResource DialogCornerRadius}" />
<Setter Property="Transitions">
<Transitions>
@@ -144,8 +144,8 @@
</ControlTheme>
<ControlTheme x:Key="{x:Type u:DefaultDialogControl}" TargetType="u:DefaultDialogControl">
<Setter Property="MinWidth" Value="96" />
<Setter Property="MinHeight" Value="96" />
<Setter Property="MinWidth" Value="{DynamicResource DialogMinWidth}"/>
<Setter Property="MinHeight" Value="{DynamicResource DialogMinHeight}"/>
<Setter Property="CornerRadius" Value="{DynamicResource DialogCornerRadius}" />
<Setter Property="Transitions">
<Transitions>
@@ -173,8 +173,6 @@
<ContentPresenter
Name="PART_ContentPresenter"
Margin="24,8"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{TemplateBinding Content}" />
</ScrollViewer>
<Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
@@ -464,6 +462,8 @@
<Setter Property="ExtendClientAreaTitleBarHeightHint" Value="1" />
<Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
<Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome" />
<Setter Property="MinWidth" Value="{DynamicResource DialogMinWidth}"/>
<Setter Property="MinHeight" Value="{DynamicResource DialogMinHeight}"/>
<Setter Property="SystemDecorations">
<OnPlatform>
<OnPlatform.Windows>
@@ -512,12 +512,10 @@
Margin="0,24,24,0"
Theme="{DynamicResource CloseButton}" />
</Grid>
<u:WindowResizer
Grid.Row="0"
Grid.RowSpan="2"
IsVisible="{TemplateBinding IsManagedResizerVisible}" />
</Grid>
</VisualLayerManager>
<u:WindowResizer IsVisible="{TemplateBinding IsManagedResizerVisible}" />
</Panel>
</ControlTemplate>
</Setter>
@@ -536,6 +534,8 @@
<Setter Property="ExtendClientAreaTitleBarHeightHint" Value="1" />
<Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
<Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome" />
<Setter Property="MinWidth" Value="{DynamicResource DialogMinWidth}"/>
<Setter Property="MinHeight" Value="{DynamicResource DialogMinHeight}"/>
<Setter Property="SystemDecorations">
<OnPlatform>
<OnPlatform.Windows>
@@ -626,12 +626,10 @@
Content="{DynamicResource STRING_MENU_DIALOG_OK}"
Theme="{DynamicResource SolidButton}" />
</StackPanel>
<u:WindowResizer
Grid.Row="0"
Grid.RowSpan="3"
IsVisible="{TemplateBinding IsManagedResizerVisible}" />
</Grid>
</VisualLayerManager>
<u:WindowResizer IsVisible="{TemplateBinding IsManagedResizerVisible}" />
</Panel>
</ControlTemplate>
</Setter>

2
src/Ursa.Themes.Semi/Themes/Shared/Dialog.axaml
View File

@@ -6,4 +6,6 @@
<StreamGeometry x:Key="DialogArrangeSendBackwardGlyph">M2,2H16V16H2V2M22,8V22H8V18H18V8H22M4,4V14H14V4H4Z</StreamGeometry>
<StreamGeometry x:Key="DialogArrangeSendToBackGlyph">M2,2H11V11H2V2M9,4H4V9H9V4M22,13V22H13V13H22M15,20H20V15H15V20M16,8V11H13V8H16M11,16H8V13H11V16Z</StreamGeometry>
<CornerRadius x:Key="DialogCornerRadius">12</CornerRadius>
<x:Double x:Key="DialogMinWidth">48</x:Double>
<x:Double x:Key="DialogMinHeight">48</x:Double>
</ResourceDictionary>