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

Merge pull request #316 from irihitech/286-modal

Browse Source 
Automatically focus on overlay modal dialog/messagebox/drawer
This commit is contained in:
Dong Bin
2024-09-05 17:28:17 +08:00
committed by GitHub
parent f8cb5dbd54 abe42fc189
commit a552244b42
10 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@
<ControlTemplate TargetType="u:CustomDialogControl">
<Border
Name="PART_Border"
Focusable="True"
Padding="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -152,6 +153,7 @@
<Border
Name="PART_Border"
Padding="0"
Focusable="True"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
BoxShadow="0 0 8 0 #1A000000"

2
src/Ursa.Themes.Semi/Controls/Drawer.axaml
View File

@@ -11,6 +11,7 @@
<Setter Property="Template">
<ControlTemplate TargetType="u:CustomDrawerControl">
<Border Name="PART_Root"
Focusable="True"
Margin="{TemplateBinding Padding, Converter={x:Static c:ThicknessTakeConverter.Left}}"
Padding="0"
HorizontalAlignment="Stretch"
@@ -77,6 +78,7 @@
<Setter Property="Template">
<ControlTemplate TargetType="u:DefaultDrawerControl">
<Border Name="PART_Root"
Focusable="True"
Margin="{TemplateBinding Padding, Converter={x:Static c:ThicknessTakeConverter.Left}}"
Padding="0"
HorizontalAlignment="Stretch"

12
src/Ursa.Themes.Semi/Controls/MessageBox.axaml
View File

@@ -33,9 +33,9 @@
<Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
<Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
<Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
<ChromeOverlayLayer />
<Grid RowDefinitions="Auto, *, Auto">
<Grid
<VisualLayerManager>
<Grid RowDefinitions="Auto, *, Auto">
<Grid
Grid.Row="0"
Margin="24,24,24,0"
ColumnDefinitions="Auto, *, Auto">
@@ -61,7 +61,7 @@
Grid.Column="2"
Theme="{DynamicResource CloseButton}" />
</Grid>
<Grid
<Grid
Grid.Row="1"
MaxWidth="{DynamicResource MessageBoxWindowContentMaxWidth}"
Margin="{TemplateBinding Padding}"
@@ -79,7 +79,7 @@
TextWrapping="Wrap" />
</ScrollViewer>
</Grid>
<StackPanel
<StackPanel
Grid.Row="2"
Margin="24,0,24,24"
HorizontalAlignment="Right"
@@ -109,6 +109,7 @@
Theme="{DynamicResource SolidButton}" />
</StackPanel>
</Grid>
</VisualLayerManager>
</Panel>
</ControlTemplate>
</Setter>
@@ -155,6 +156,7 @@
<ControlTemplate TargetType="u:MessageBoxControl">
<Border
Padding="0"
Focusable="True"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Classes="Shadow"

4
src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
View File

@@ -65,7 +65,9 @@
Margin="{Binding $parent[u:UrsaWindow].TitleBarMargin}"
LeftContent="{Binding $parent[u:UrsaWindow].LeftContent}"
RightContent="{Binding $parent[u:UrsaWindow].RightContent}" />
<u:OverlayDialogHost IsModalStatusReporter="True" />
<VisualLayerManager>
<u:OverlayDialogHost IsModalStatusReporter="True" />
</VisualLayerManager>
</VisualLayerManager.ChromeOverlayLayer>
<Panel>
<ContentPresenter