Menus are now fully themed !

flarive · Nov 2, 2023 · cec73f6 · cec73f6
1 parent f64e8ac
commit cec73f6
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 336 deletions.
diff --git a/Avalonia.Themes.Neumorphism/Avalonia.Themes.Neumorphism.csproj b/Avalonia.Themes.Neumorphism/Avalonia.Themes.Neumorphism.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
 	<TargetFramework>netstandard2.1</TargetFramework>
-	<Version>0.7.0</Version>
+	<Version>0.8.0</Version>
 	<Title>Neumorphism.Avalonia</Title>
 	<Authors>Eviral</Authors>
 	<Company>Eviral</Company>

diff --git a/Avalonia.Themes.Neumorphism/Themes/Menu.xaml b/Avalonia.Themes.Neumorphism/Themes/Menu.xaml
@@ -114,7 +114,7 @@
                               HorizontalAlignment="Center"
                               KeyboardNavigation.TabNavigation="Continue" />
             </Border>
-            <Rectangle Name="PART_Stroke" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1" Fill="#ffd1d6dc"/>
+            <Rectangle Name="PART_Stroke" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1" Fill="{DynamicResource MaterialDesignBorderShadowColor}"/>
         </Panel>
       </ControlTemplate>
     </Setter>
@@ -144,7 +144,7 @@
     <Setter Property="Background" Value="Transparent"/>
     <Setter Property="Height" Value="48"/>
     <Setter Property="HorizontalAlignment" Value="Left"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignBorderShadowColor}"/>
     <Setter Property="BorderThickness" Value="1"/>
     <Setter Property="ItemContainerTheme" Value="{StaticResource MenuCapsuleBarFlatMenuItem}" />
   </ControlTheme>

diff --git a/Avalonia.Themes.Neumorphism/Themes/MenuItem.xaml b/Avalonia.Themes.Neumorphism/Themes/MenuItem.xaml
@@ -141,7 +141,7 @@
                  IsLightDismissEnabled="False"
                  IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
             <Border Name="PART_PopupBorder"
-                    Background="{DynamicResource MenuFlyoutPresenterBackground}"
+                    Background="{DynamicResource MaterialDesignPaper}"
                     BorderBrush="{TemplateBinding assist:MenuAssist.PopupBorderBrush}"
                     BorderThickness="{TemplateBinding assist:MenuAssist.PopupBorderThickness}"
                     Padding="{DynamicResource MenuFlyoutPresenterThemePadding}"

diff --git a/Neumorphism.Avalonia.Demo/Dialogs/DialogResult.cs b/Neumorphism.Avalonia.Demo/Dialogs/DialogResult.cs
diff --git a/Neumorphism.Avalonia.Demo/Dialogs/Enums/DialogButtonsEnum.cs b/Neumorphism.Avalonia.Demo/Dialogs/Enums/DialogButtonsEnum.cs
diff --git a/Neumorphism.Avalonia.Demo/Dialogs/Enums/TextFieldKindEnum.cs b/Neumorphism.Avalonia.Demo/Dialogs/Enums/TextFieldKindEnum.cs
diff --git a/Neumorphism.Avalonia.Demo/Dialogs/Icons/DialogIcon.cs b/Neumorphism.Avalonia.Demo/Dialogs/Icons/DialogIcon.cs
diff --git a/Neumorphism.Avalonia.Demo/Dialogs/Icons/DialogIconKind.cs b/Neumorphism.Avalonia.Demo/Dialogs/Icons/DialogIconKind.cs
diff --git a/Neumorphism.Avalonia.Demo/Dialogs/Icons/DialogIconsDataFactory.cs b/Neumorphism.Avalonia.Demo/Dialogs/Icons/DialogIconsDataFactory.cs
diff --git a/Neumorphism.Avalonia.Demo/Dialogs/Interfaces/IDialogResult.cs b/Neumorphism.Avalonia.Demo/Dialogs/Interfaces/IDialogResult.cs
diff --git a/Neumorphism.Avalonia.Demo/Dialogs/Interfaces/IDialogWindow.cs b/Neumorphism.Avalonia.Demo/Dialogs/Interfaces/IDialogWindow.cs
diff --git a/Neumorphism.Avalonia.Demo/Dialogs/Interfaces/IDialogWindowResult.cs b/Neumorphism.Avalonia.Demo/Dialogs/Interfaces/IDialogWindowResult.cs
diff --git a/Neumorphism.Avalonia.Demo/Dialogs/Interfaces/IHasNegativeResult.cs b/Neumorphism.Avalonia.Demo/Dialogs/Interfaces/IHasNegativeResult.cs