Simplify demo

zyatao · Jun 2, 2024 · b13221e · b13221e
1 parent 1699665
commit b13221e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/samples/Wpf.Ui.Demo.Dialogs/App.xaml b/samples/Wpf.Ui.Demo.Dialogs/App.xaml
@@ -2,15 +2,4 @@
     x:Class="Wpf.Ui.Demo.Dialogs.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:Wpf.Ui.Demo.Dialogs"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-    StartupUri="MainWindow.xaml">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ui:ThemesDictionary Theme="Light" />
-                <ui:ControlsDictionary />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
+    StartupUri="MainWindow.xaml" />
diff --git a/samples/Wpf.Ui.Demo.Dialogs/MainWindow.xaml b/samples/Wpf.Ui.Demo.Dialogs/MainWindow.xaml
@@ -3,13 +3,20 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:Wpf.Ui.Demo.Dialogs"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     Title="WPF UI - Dialog sample"
     Width="800"
     Height="450"
     mc:Ignorable="d">
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ui:ThemesDictionary Theme="Light" />
+                <ui:ControlsDictionary />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
 
     <Grid>
         <ui:Button

diff --git a/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.cs b/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.cs
@@ -629,6 +629,7 @@ protected virtual void OnLoaded()
 
     private Size GetNewDialogSize(Size desiredSize)
     {
+        // TODO: Handle negative values
         var paddingWidth = Padding.Left + Padding.Right;
         var paddingHeight = Padding.Top + Padding.Bottom;