From 8fd2b05b4d07c0a60d192ac4532d891e115e7dd3 Mon Sep 17 00:00:00 2001
From: Frederik Jacobsen <Frederik1904@gmail.com>
Date: Sat, 18 Oct 2025 18:53:07 +0200
Subject: [PATCH] More UX modifications

---
 XSDVisualiser.Desktop/App.axaml        |   6 ++
 XSDVisualiser.Desktop/MainWindow.axaml | 143 ++++++++++++++++++++++---
 2 files changed, 134 insertions(+), 15 deletions(-)

diff --git a/XSDVisualiser.Desktop/App.axaml b/XSDVisualiser.Desktop/App.axaml
index cef4d89..b0901c0 100644
--- a/XSDVisualiser.Desktop/App.axaml
+++ b/XSDVisualiser.Desktop/App.axaml
@@ -18,5 +18,11 @@
   <Application.Styles>
     <!-- Use Fluent theme for consistent UI controls -->
     <fluent:FluentTheme/>
+
+    <!-- Default TextBlock accessibility improvements -->
+    <Style Selector="TextBlock">
+      <Setter Property="TextWrapping" Value="Wrap"/>
+      <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+    </Style>
   </Application.Styles>
 </Application>
diff --git a/XSDVisualiser.Desktop/MainWindow.axaml b/XSDVisualiser.Desktop/MainWindow.axaml
index 972a6fa..1f56b1f 100644
--- a/XSDVisualiser.Desktop/MainWindow.axaml
+++ b/XSDVisualiser.Desktop/MainWindow.axaml
@@ -50,7 +50,7 @@
                                     <Border CornerRadius="4"
                                             BorderBrush="{Binding Cardinality, Converter={StaticResource OptionalToBrush}}"
                                             BorderThickness="{Binding Cardinality, Converter={StaticResource OptionalToThickness}}"
-                                            Padding="8" Margin="0,0,0,6" Background="#FAFAFA">
+                                            Padding="8" Margin="0,0,0,6" Background="{DynamicResource PanelBackgroundBrush}">
                                         <StackPanel Orientation="Vertical" Spacing="2">
                                             <!-- Name on its own line, prominent -->
                                             <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/>
@@ -95,7 +95,7 @@
 
                                     <!-- General info -->
                                     <Border BorderBrush="{DynamicResource PanelBorderBrush}" BorderThickness="1" CornerRadius="4" Padding="10">
-                                        <Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto">
+                                        <Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
                                             <TextBlock Text="Name:" FontWeight="Bold"/>
                                             <TextBlock Grid.Column="1" Margin="8,0,0,0" Text="{Binding Name}"/>
 
@@ -113,29 +113,92 @@
 
                                             <TextBlock Grid.Column="2" Text="Model:" FontWeight="Bold"/>
                                             <TextBlock Grid.Column="3" Margin="8,0,0,0" Text="{Binding ContentModel}"/>
+
+                                            <TextBlock Grid.Row="5" Text="Nillable:" FontWeight="Bold"/>
+                                            <TextBlock Grid.Column="1" Grid.Row="5" Margin="8,0,0,0" Text="{Binding IsNillable}"/>
                                         </Grid>
                                     </Border>
 
-                                    <!-- Attributes list -->
+                                    <!-- Attributes -->
                                     <StackPanel>
                                         <TextBlock Text="Attributes" FontWeight="SemiBold"/>
                                         <ItemsControl ItemsSource="{Binding Attributes}">
                                             <ItemsControl.ItemTemplate>
                                                 <DataTemplate x:DataType="m:AttributeInfo">
                                                     <Border BorderBrush="{DynamicResource PanelBorderBrush}" BorderThickness="1" CornerRadius="4" Padding="8" Margin="0,6,0,0">
-                                                        <Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="Auto,Auto,Auto">
-                                                            <TextBlock Text="Name:" FontWeight="Bold"/>
-                                                            <TextBlock Grid.Column="1" Margin="8,0,0,0" Text="{Binding Name}"/>
+                                                        <StackPanel Spacing="8">
+                                                            <Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="Auto,Auto,Auto">
+                                                                <TextBlock Text="Name:" FontWeight="Bold"/>
+                                                                <TextBlock Grid.Column="1" Margin="8,0,0,0" Text="{Binding Name}"/>
 
-                                                            <TextBlock Grid.Row="1" Text="Type:" FontWeight="Bold"/>
-                                                            <TextBlock Grid.Column="1" Grid.Row="1" Margin="8,0,0,0" Text="{Binding TypeName}"/>
+                                                                <TextBlock Grid.Row="1" Text="Use:" FontWeight="Bold"/>
+                                                                <TextBlock Grid.Column="1" Grid.Row="1" Margin="8,0,0,0" Text="{Binding Use}"/>
 
-                                                            <TextBlock Grid.Row="2" Text="Use:" FontWeight="Bold"/>
-                                                            <TextBlock Grid.Column="1" Grid.Row="2" Margin="8,0,0,0" Text="{Binding Use}"/>
+                                                                <TextBlock Grid.Row="2" Text="Type:" FontWeight="Bold"/>
+                                                                <TextBlock Grid.Column="1" Grid.Row="2" Margin="8,0,0,0" Text="{Binding TypeName}"/>
 
-                                                            <TextBlock Grid.Column="2" Text="Built-in:" FontWeight="Bold"/>
-                                                            <TextBlock Grid.Column="3" Margin="8,0,0,0" Text="{Binding BuiltInType}"/>
-                                                        </Grid>
+                                                                <TextBlock Grid.Column="2" Text="Built-in:" FontWeight="Bold"/>
+                                                                <TextBlock Grid.Column="3" Margin="8,0,0,0" Text="{Binding BuiltInType}"/>
+                                                            </Grid>
+
+                                                            <StackPanel IsVisible="{Binding Constraints, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                <TextBlock Text="Constraints" FontWeight="SemiBold"/>
+                                                                <StackPanel>
+                                                                    <TextBlock Text="Enumerations" FontWeight="SemiBold"/>
+                                                                    <ItemsControl ItemsSource="{Binding Constraints.Enumerations}">
+                                                                        <ItemsControl.ItemTemplate>
+                                                                            <DataTemplate x:DataType="x:String">
+                                                                                <TextBlock Text="{Binding ., StringFormat=• {0}}"/>
+                                                                            </DataTemplate>
+                                                                        </ItemsControl.ItemTemplate>
+                                                                    </ItemsControl>
+                                                                </StackPanel>
+                                                                <StackPanel>
+                                                                    <TextBlock Text="Patterns" FontWeight="SemiBold"/>
+                                                                    <ItemsControl ItemsSource="{Binding Constraints.Patterns}">
+                                                                        <ItemsControl.ItemTemplate>
+                                                                            <DataTemplate x:DataType="x:String">
+                                                                                <TextBlock Text="{Binding ., StringFormat=• {0}}"/>
+                                                                            </DataTemplate>
+                                                                        </ItemsControl.ItemTemplate>
+                                                                    </ItemsControl>
+                                                                </StackPanel>
+                                                                <StackPanel IsVisible="{Binding Constraints.Numeric, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                    <TextBlock Text="Numeric bounds" FontWeight="SemiBold"/>
+                                                                    <StackPanel Orientation="Horizontal" IsVisible="{Binding Constraints.Numeric.MinInclusive, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                        <TextBlock Text="Min inclusive:" FontWeight="Bold"/>
+                                                                        <TextBlock Margin="8,0,0,0" Text="{Binding Constraints.Numeric.MinInclusive}"/>
+                                                                    </StackPanel>
+                                                                    <StackPanel Orientation="Horizontal" IsVisible="{Binding Constraints.Numeric.MaxInclusive, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                        <TextBlock Text="Max inclusive:" FontWeight="Bold"/>
+                                                                        <TextBlock Margin="8,0,0,0" Text="{Binding Constraints.Numeric.MaxInclusive}"/>
+                                                                    </StackPanel>
+                                                                    <StackPanel Orientation="Horizontal" IsVisible="{Binding Constraints.Numeric.MinExclusive, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                        <TextBlock Text="Min exclusive:" FontWeight="Bold"/>
+                                                                        <TextBlock Margin="8,0,0,0" Text="{Binding Constraints.Numeric.MinExclusive}"/>
+                                                                    </StackPanel>
+                                                                    <StackPanel Orientation="Horizontal" IsVisible="{Binding Constraints.Numeric.MaxExclusive, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                        <TextBlock Text="Max exclusive:" FontWeight="Bold"/>
+                                                                        <TextBlock Margin="8,0,0,0" Text="{Binding Constraints.Numeric.MaxExclusive}"/>
+                                                                    </StackPanel>
+                                                                </StackPanel>
+                                                                <StackPanel IsVisible="{Binding Constraints.Length, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                    <TextBlock Text="Length bounds" FontWeight="SemiBold"/>
+                                                                    <StackPanel Orientation="Horizontal" IsVisible="{Binding Constraints.Length.LengthSpecified}">
+                                                                        <TextBlock Text="Length:" FontWeight="Bold"/>
+                                                                        <TextBlock Margin="8,0,0,0" Text="{Binding Constraints.Length.Length}"/>
+                                                                    </StackPanel>
+                                                                    <StackPanel Orientation="Horizontal" IsVisible="{Binding Constraints.Length.MinLengthSpecified}">
+                                                                        <TextBlock Text="Min length:" FontWeight="Bold"/>
+                                                                        <TextBlock Margin="8,0,0,0" Text="{Binding Constraints.Length.MinLength}"/>
+                                                                    </StackPanel>
+                                                                    <StackPanel Orientation="Horizontal" IsVisible="{Binding Constraints.Length.MaxLengthSpecified}">
+                                                                        <TextBlock Text="Max length:" FontWeight="Bold"/>
+                                                                        <TextBlock Margin="8,0,0,0" Text="{Binding Constraints.Length.MaxLength}"/>
+                                                                    </StackPanel>
+                                                                </StackPanel>
+                                                            </StackPanel>
+                                                        </StackPanel>
                                                     </Border>
                                                 </DataTemplate>
                                             </ItemsControl.ItemTemplate>
@@ -154,12 +217,62 @@
 
                                                         <StackPanel>
                                                             <TextBlock Text="Enumerations" FontWeight="SemiBold"/>
-                                                            <ItemsControl ItemsSource="{Binding Enumerations}"/>
+                                                            <ItemsControl ItemsSource="{Binding Enumerations}">
+                                                                <ItemsControl.ItemTemplate>
+                                                                    <DataTemplate x:DataType="x:String">
+                                                                        <TextBlock Text="{Binding ., StringFormat=• {0}}"/>
+                                                                    </DataTemplate>
+                                                                </ItemsControl.ItemTemplate>
+                                                            </ItemsControl>
                                                         </StackPanel>
 
                                                         <StackPanel>
                                                             <TextBlock Text="Patterns" FontWeight="SemiBold"/>
-                                                            <ItemsControl ItemsSource="{Binding Patterns}"/>
+                                                            <ItemsControl ItemsSource="{Binding Patterns}">
+                                                                <ItemsControl.ItemTemplate>
+                                                                    <DataTemplate x:DataType="x:String">
+                                                                        <TextBlock Text="{Binding ., StringFormat=• {0}}"/>
+                                                                    </DataTemplate>
+                                                                </ItemsControl.ItemTemplate>
+                                                            </ItemsControl>
+                                                        </StackPanel>
+
+                                                        <!-- Numeric bounds -->
+                                                        <StackPanel IsVisible="{Binding Numeric, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                            <TextBlock Text="Numeric bounds" FontWeight="SemiBold"/>
+                                                            <StackPanel Orientation="Horizontal" IsVisible="{Binding Numeric.MinInclusive, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                <TextBlock Text="Min inclusive:" FontWeight="Bold"/>
+                                                                <TextBlock Margin="8,0,0,0" Text="{Binding Numeric.MinInclusive}"/>
+                                                            </StackPanel>
+                                                            <StackPanel Orientation="Horizontal" IsVisible="{Binding Numeric.MaxInclusive, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                <TextBlock Text="Max inclusive:" FontWeight="Bold"/>
+                                                                <TextBlock Margin="8,0,0,0" Text="{Binding Numeric.MaxInclusive}"/>
+                                                            </StackPanel>
+                                                            <StackPanel Orientation="Horizontal" IsVisible="{Binding Numeric.MinExclusive, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                <TextBlock Text="Min exclusive:" FontWeight="Bold"/>
+                                                                <TextBlock Margin="8,0,0,0" Text="{Binding Numeric.MinExclusive}"/>
+                                                            </StackPanel>
+                                                            <StackPanel Orientation="Horizontal" IsVisible="{Binding Numeric.MaxExclusive, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                                <TextBlock Text="Max exclusive:" FontWeight="Bold"/>
+                                                                <TextBlock Margin="8,0,0,0" Text="{Binding Numeric.MaxExclusive}"/>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <!-- Length bounds -->
+                                                        <StackPanel IsVisible="{Binding Length, Converter={x:Static ObjectConverters.IsNotNull}}">
+                                                            <TextBlock Text="Length bounds" FontWeight="SemiBold"/>
+                                                            <StackPanel Orientation="Horizontal" IsVisible="{Binding Length.LengthSpecified}">
+                                                                <TextBlock Text="Length:" FontWeight="Bold"/>
+                                                                <TextBlock Margin="8,0,0,0" Text="{Binding Length.Length}"/>
+                                                            </StackPanel>
+                                                            <StackPanel Orientation="Horizontal" IsVisible="{Binding Length.MinLengthSpecified}">
+                                                                <TextBlock Text="Min length:" FontWeight="Bold"/>
+                                                                <TextBlock Margin="8,0,0,0" Text="{Binding Length.MinLength}"/>
+                                                            </StackPanel>
+                                                            <StackPanel Orientation="Horizontal" IsVisible="{Binding Length.MaxLengthSpecified}">
+                                                                <TextBlock Text="Max length:" FontWeight="Bold"/>
+                                                                <TextBlock Margin="8,0,0,0" Text="{Binding Length.MaxLength}"/>
+                                                            </StackPanel>
                                                         </StackPanel>
                                                     </StackPanel>
                                                 </DataTemplate>