Merge branch 'main' into 196-alt-key-accelerators-arent-rendered

jinek · Dec 13, 2024 · 54b9803 · 54b9803
2 parents 077d770 + c28d793
commit 54b9803
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml
@@ -6,7 +6,6 @@
                      xmlns:controls="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core"
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
-                     Title="Dialog"
                      x:Class="Consolonia.Gallery.Gallery.GalleryViews.SomeDialogWindow">
     <Panel>
         <TextBlock xml:space="preserve"

diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
@@ -7,11 +7,14 @@ namespace Consolonia.Gallery.Gallery.GalleryViews
 {
     public partial class SomeDialogWindow : DialogWindow
     {
+        internal const string DialogTitle = "Dialog popup";
+
         private static readonly Random Random = new();
 
         public SomeDialogWindow(double width, double height)
         {
             InitializeComponent();
+            Title = DialogTitle;
             Width = width;
             Height = height;
 

diff --git a/src/Consolonia.Themes/Templates/Controls/AllControls.axaml b/src/Consolonia.Themes/Templates/Controls/AllControls.axaml
@@ -18,7 +18,6 @@
                 <MergeResourceInclude Source="/Templates/Controls/ContentControl.axaml" />
                 <MergeResourceInclude Source="/Templates/Controls/DataGrid.axaml" />
                 <MergeResourceInclude Source="/Templates/Controls/CaretControl.axaml" />
-                <MergeResourceInclude Source="/Templates/Controls/DialogWindow.axaml" />
                 <MergeResourceInclude Source="/Templates/Controls/ItemsControl.axaml" />
                 <MergeResourceInclude Source="/Templates/Controls/LightDismissOverlaylayer.axaml" />
                 <MergeResourceInclude Source="/Templates/Controls/DataValidationErrors.axaml" />
@@ -44,4 +43,5 @@
     </Styles.Resources>
 
     <StyleInclude Source="/Templates/Controls/UserControl.axaml" />
+    <StyleInclude Source="/Templates/Controls/DialogWindow.axaml" />
 </Styles>
diff --git a/src/Consolonia.Themes/Templates/Controls/DialogWindow.axaml b/src/Consolonia.Themes/Templates/Controls/DialogWindow.axaml
@@ -1,12 +1,12 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core"
-                    xmlns:helpers="clr-namespace:Consolonia.Themes.Templates.Controls.Helpers"
-                    xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
-    <Thickness x:Key="ConsoloniaDialogWindowBorderMargin">1,0</Thickness>
-
-    <ControlTheme x:Key="{x:Type controls:DialogWindow}"
-                  TargetType="controls:DialogWindow">
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:controls="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core"
+        xmlns:helpers="clr-namespace:Consolonia.Themes.Templates.Controls.Helpers"
+        xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+    <Styles.Resources>
+        <Thickness x:Key="ConsoloniaDialogWindowBorderMargin">1,0</Thickness>
+    </Styles.Resources>
+    <Style Selector=":is(controls|DialogWindow)">
         <Setter Property="Background"
                 Value="{DynamicResource ThemeAlternativeBackgroundBrush}" />
         <Setter Property="BorderBrush"
@@ -103,5 +103,5 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-    </ControlTheme>
-</ResourceDictionary>
+    </Style>
+</Styles>
diff --git a/src/Tests/Consolonia.Gallery.Tests/DialogTests.cs b/src/Tests/Consolonia.Gallery.Tests/DialogTests.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Avalonia.Input;
+using Consolonia.Gallery.Gallery.GalleryViews;
 using Consolonia.Gallery.Tests.Base;
 using Consolonia.NUnit;
 using NUnit.Framework;
@@ -16,6 +17,7 @@ public async Task PerformSingleTest()
             await UITest.KeyInput(Key.Enter);
             await UITest.KeyInput(Key.Tab);
             await UITest.AssertHasText("One More");
+            await UITest.AssertHasText(SomeDialogWindow.DialogTitle);
             await UITest.KeyInput(Key.Escape);
             await UITest.AssertHasNoText("One More");
         }