Merge pull request #345 from af-silva/master

Fix Custom Dialog Dockpanel still using space even if its children are set to invisible
AvaloniaCommunity · Jan 29, 2024 · b53cf89 · b53cf89
2 parents bd9d8ba + 468a890
commit b53cf89
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 2 deletions.
diff --git a/Material.Avalonia.Dialogs/Styles/EmbeddedDialogControl.axaml b/Material.Avalonia.Dialogs/Styles/EmbeddedDialogControl.axaml
@@ -25,7 +25,12 @@
                                               Content="{CompiledBinding DialogIcon}"
                                               ContentTemplate="{StaticResource DialogHeaderIconTemplate}"
                                               IsVisible="{CompiledBinding !!DialogIcon}" />
-
+                            <DockPanel.IsVisible>
+                                <MultiBinding Converter="{x:Static BoolConverters.Or}">
+                                    <CompiledBinding Converter="{x:Static ObjectConverters.IsNotNull}" Path="DialogIcon" />
+                                    <CompiledBinding Converter="{x:Static StringConverters.IsNotNullOrEmpty}" Path="ContentHeader" />
+                                </MultiBinding>
+                            </DockPanel.IsVisible>
                             <TextBlock Name="{x:Static naming:PartNames.PartHeaderText}"
                                        Classes="Headline6"
                                        IsVisible="{CompiledBinding !!ContentHeader.Length}"

diff --git a/Material.Demo/Pages/CustomDialogContentDemo.axaml b/Material.Demo/Pages/CustomDialogContentDemo.axaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="Material.Demo.Pages.CustomDialogContentDemo"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             d:DesignHeight="450"
+             d:DesignWidth="800"
+             mc:Ignorable="d">
+    <Grid Margin="5"
+          Background="LightGray"
+          RowDefinitions="Auto,*">
+        <TextBox Text="This should use all the available space!" />
+    </Grid>
+</UserControl>
diff --git a/Material.Demo/Pages/CustomDialogContentDemo.axaml.cs b/Material.Demo/Pages/CustomDialogContentDemo.axaml.cs
@@ -0,0 +1,11 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Material.Demo.Pages; 
+
+public partial class CustomDialogContentDemo : UserControl {
+    public CustomDialogContentDemo() {
+        InitializeComponent();
+    }
+}
diff --git a/Material.Demo/ViewModels/DialogDemoViewModel.cs b/Material.Demo/ViewModels/DialogDemoViewModel.cs
@@ -5,6 +5,7 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
+using Material.Demo.Pages;
 using Material.Dialog;
 using Material.Dialog.Enums;
 using Material.Dialog.Icons;
@@ -31,7 +32,8 @@ public DialogDemoViewModel() {
                 new DialogDemoItemViewModel("Login dialog", LoginDialog),
                 new DialogDemoItemViewModel("Folder rename dialog", FolderNameDialog),
                 new DialogDemoItemViewModel("Time picker", TimePickerDialog),
-                new DialogDemoItemViewModel("Date picker", DatePickerDialog)
+                new DialogDemoItemViewModel("Date picker", DatePickerDialog),
+                new DialogDemoItemViewModel("Custom dialog", CustomDialog),
             };
         }
 
@@ -267,5 +269,22 @@ private async IAsyncEnumerable<string> DatePickerDialog() {
             yield return $"TimeSpan: {r.ToString("d")}";
             _previousDatePickerResult = r;
         }
+
+        private async IAsyncEnumerable<string> CustomDialog() {
+            // Open asset stream using assets.Open method.
+            await using var icon = AssetLoader.Open(new Uri("avares://Material.Demo/Assets/avalonia-logo.png"));
+
+            var dialog = DialogHelper.CreateCustomDialog(new CustomDialogBuilderParams()
+            {
+                Content = new CustomDialogContentDemo(),
+                StartupLocation = WindowStartupLocation.CenterOwner,
+                Borderless = false,
+            });
+
+            var result = await dialog.ShowDialog(_window);
+
+            yield return $"Result: {result.GetResult}";
+        }
+
     }
 }