updating controls

kikipoulet · Aug 13, 2024 · 32082c9 · 32082c9
1 parent 3cf4e4f
commit 32082c9
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 28 deletions.
diff --git a/SukiUI/ColorTheme/Dark.axaml b/SukiUI/ColorTheme/Dark.axaml
@@ -38,7 +38,7 @@
     <system:Double x:Key="GlassOpacity">0.18</system:Double>
 
     <system:Double x:Key="ControlGlassOpacity">0.3</system:Double>
-    <system:Double x:Key="DiscreteControlGlassOpacity">0.14</system:Double>
+    <system:Double x:Key="DiscreteControlGlassOpacity">0.17</system:Double>
     <Color x:Key="ControlSukiGlassCardBackground">#49aaaaaa</Color>
 
 </ResourceDictionary>
diff --git a/SukiUI/ColorTheme/Light.axaml b/SukiUI/ColorTheme/Light.axaml
@@ -38,7 +38,7 @@
     <system:Double x:Key="GlassOpacity">0.42</system:Double>
 
     <system:Double x:Key="ControlGlassOpacity">0.05</system:Double>
-    <system:Double x:Key="DiscreteControlGlassOpacity">0.3</system:Double>
+    <system:Double x:Key="DiscreteControlGlassOpacity">0.31</system:Double>
     <Color x:Key="ControlSukiGlassCardBackground">#fd111111</Color>
 
 </ResourceDictionary>
diff --git a/SukiUI/Controls/GlassMorphism/GlassCard.axaml b/SukiUI/Controls/GlassMorphism/GlassCard.axaml
@@ -60,14 +60,21 @@
             <Setter Property="IsAnimated" Value="False"></Setter>
             <Setter Property="Padding" Value="0"></Setter>
         </Style>
+
+        <Style Selector="^.Discrete">
+
+            <Setter Property="Padding" Value="0"></Setter>
+        </Style>
         <Style Selector="^.Control /template/ Border#PART_BorderCard">
             <Setter Property="Background" Value="{DynamicResource ControlSukiGlassCardBackground}" />
             <Setter Property="Opacity" Value="{DynamicResource ControlGlassOpacity}" />
         </Style>
 
         <Style Selector="^.Discrete /template/ Border#PART_BorderCard">
-
+            <Setter Property="Background" Value="{DynamicResource SukiGlassCardBackground}" />
             <Setter Property="Opacity" Value="{DynamicResource DiscreteControlGlassOpacity}" />
+
+
         </Style>
 
         <Style Selector="^.Primary /template/ Border#PART_ClipBorder">

diff --git a/SukiUI/Controls/PropertyGrid/PropertyGridTemplateSelector.axaml b/SukiUI/Controls/PropertyGrid/PropertyGridTemplateSelector.axaml
@@ -41,7 +41,7 @@
 
             <TextBlock Classes="Label" />
             <DatePicker Grid.Column="2" Width="175"
-                        Margin="4,0" Height="36"
+                        Margin="-6,0" Height="36"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Stretch"
                         IsEnabled="{Binding !IsReadOnly}"
@@ -59,7 +59,7 @@
 
             <TextBlock Classes="Label" />
             <DatePicker Grid.Column="2"
-                        Margin="4,0" Height="36"
+                        Margin="-6,0" Height="36"
                         HorizontalAlignment="Right" Width="175"
                         VerticalAlignment="Stretch"
                         IsEnabled="{Binding !IsReadOnly}"

diff --git a/SukiUI/Theme/CalendarDatePickerStyle.axaml b/SukiUI/Theme/CalendarDatePickerStyle.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="using:System"
+                    xmlns:suki="https://github.com/kikipoulet/SukiUI"
                     x:ClassModifier="internal">
 
     <Design.PreviewWith>
@@ -13,21 +14,24 @@
 
     <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="38" />
         <Setter Property="BorderThickness" Value="0,0,0,1" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
             <ControlTemplate>
+                <suki:GlassCard Height="{TemplateBinding Height}" CornerRadius="{DynamicResource SmallCornerRadius}" Classes="Discrete" >
                 <Grid ColumnDefinitions="*,Auto">
                     <Grid.Styles>
                         <Style Selector="Button.CalendarDropDown">
                             <Setter Property="Template">
                                 <ControlTemplate>
+
                                     <Grid Width="22"
                                           Height="20"
-                                          Margin="0,0,0,0"
+                                          Margin="0,0,16,0"
                                           HorizontalAlignment="Center"
                                           VerticalAlignment="Center"
                                           Background="Transparent"
@@ -74,6 +78,7 @@
                                                  Fill="{DynamicResource SukiControlBorderBrush}"
                                                  StrokeThickness="0" />
                                     </Grid>
+
                                 </ControlTemplate>
                             </Setter>
                         </Style>
@@ -83,7 +88,7 @@
                         </Style>
                     </Grid.Styles>
 
-                    <TextBox Name="PART_TextBox"
+                    <TextBox Name="PART_TextBox" Classes="NoShadow"
                              Grid.Column="0"
                              Padding="{TemplateBinding Padding}"
                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -134,6 +139,7 @@
 
                     </Popup>
                 </Grid>
+                    </suki:GlassCard>
             </ControlTemplate>
         </Setter>
 

diff --git a/SukiUI/Theme/DatePicker.axaml b/SukiUI/Theme/DatePicker.axaml
@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:icons="clr-namespace:SukiUI.Content"
-                    xmlns:sys="using:System">
+                    xmlns:sys="using:System"
+                    xmlns:suki="https://github.com/kikipoulet/SukiUI">
     <Design.PreviewWith>
         <Border Width="1000"
                 Height="500"
@@ -40,22 +41,24 @@
         <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Height" Value="40" />
+        <Setter Property="Height" Value="38" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Template">
             <ControlTemplate>
                 <DataValidationErrors>
                     <Grid Name="LayoutRoot" Margin="0,0,0,0">
 
-                        <Button Name="PART_FlyoutButton"
+                        <Button Name="PART_FlyoutButton" Margin="0"
                                 Height="{TemplateBinding Height}"
-                                Background="Transparent"
-                                BorderThickness="0,0,0,1"
-                                CornerRadius="0"
+                                Background="Transparent" 
+                                BorderThickness="0,0,0,0"
+                                CornerRadius="0" Padding="0"
                                 IsEnabled="{TemplateBinding IsEnabled}"
                                 TemplatedControl.IsTemplateFocusTarget="True">
-                            <Grid Margin="0,1,0,0" ColumnDefinitions="Auto,Auto">
+                            <suki:GlassCard CornerRadius="{DynamicResource SmallCornerRadius}" Height="{TemplateBinding Height}" BorderBrush="{TemplateBinding BorderBrush}"
+                                            BorderThickness="{TemplateBinding BorderThickness}" Classes="Discrete" >
+                            <Grid Margin="14,0"  ColumnDefinitions="Auto,Auto">
                                 <Grid Name="PART_ButtonContentGrid"
                                       Grid.Column="0"
                                       VerticalAlignment="Center"
@@ -106,6 +109,7 @@
                                           Foreground="{DynamicResource SukiLowText}" />
 
                             </Grid>
+                                </suki:GlassCard>
                         </Button>
 
                         <Popup Name="PART_Popup"

diff --git a/SukiUI/Theme/DropDownButton.axaml b/SukiUI/Theme/DropDownButton.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:content="clr-namespace:SukiUI.Content">
+                    xmlns:content="clr-namespace:SukiUI.Content"
+                    xmlns:suki="https://github.com/kikipoulet/SukiUI">
     <ControlTheme x:Key="SukiDropDownButtonStyle" TargetType="DropDownButton">
         <Setter Property="BorderThickness" Value="1.2" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiMediumBorderBrush}" />
@@ -14,17 +15,15 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Border Name="RootBorder"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
+                    <suki:GlassCard Name="RootBorder" Classes="Discrete"
+                                    Padding="0"
                             ClipToBounds="True"
                             CornerRadius="{TemplateBinding CornerRadius}">
-                        <Border.Transitions>
+                        <suki:GlassCard.Transitions>
                             <Transitions>
                                 <BrushTransition Property="BorderBrush" Duration="0:0:0.25" />
                             </Transitions>
-                        </Border.Transitions>
+                        </suki:GlassCard.Transitions>
                         <Grid Name="InnerGrid">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
@@ -68,7 +67,7 @@
                             </PathIcon>
 
                         </Grid>
-                    </Border>
+                    </suki:GlassCard>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>

diff --git a/SukiUI/Theme/NumericUpDownStyles.xaml b/SukiUI/Theme/NumericUpDownStyles.xaml
@@ -6,7 +6,7 @@
         <Border Padding="20">
             <StackPanel Orientation="Horizontal" Spacing="5" >
             <NumericUpDown Value="4" />
-            <TextBox Text="test"></TextBox>
+            <TextBox Classes="NoShadow" Text="test"></TextBox>
             </StackPanel>
         </Border>
     </Design.PreviewWith>

diff --git a/SukiUI/Theme/TextBoxStyles.xaml b/SukiUI/Theme/TextBoxStyles.xaml
@@ -27,7 +27,7 @@
                 <TextBox Width="200"
                          Margin="5"
                          Text="Elem" />
-                <TextBox Classes="FlatTextBox" Text="Elem" />
+                <TextBox Classes="NoShadow" Text="Elem" />
 
                 <Panel>
                     <Border Margin="0,0,0,25" Classes="Card">
@@ -357,6 +357,7 @@
 
                         <theme:StringToDoubleConverter x:Key="StringToDoubleC" />
                     </Border.Resources>
+                    <Panel>
                     <suki:GlassCard Name="border"
                             Padding="0" Classes="Discrete"
                             BorderBrush="{TemplateBinding BorderBrush}"
@@ -368,6 +369,7 @@
                                 <BrushTransition Property="BorderBrush" Duration="0:0:0.2" />
                             </Transitions>
                         </suki:GlassCard.Transitions>
+                    </suki:GlassCard>
                         <Border Name="borderbottom"
                                 Margin="1,-1,1,-1"
                                 BorderBrush="{TemplateBinding BorderBrush}"
@@ -458,7 +460,7 @@
 
                             </DockPanel>
                         </Border>
-                    </suki:GlassCard>
+                    </Panel>
                 </Border>
 
             </ControlTemplate>
@@ -608,6 +610,7 @@
     <Style Selector="TextBox.NoShadow /template/ suki|GlassCard#border">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="IsVisible" Value="False"></Setter>
     </Style>
 
     <Style Selector="TextBox.NoShadow:focus /template/ suki|GlassCard#border">

diff --git a/SukiUI/Theme/TimePickerStyle.axaml b/SukiUI/Theme/TimePickerStyle.axaml
@@ -2,7 +2,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:icons="clr-namespace:SukiUI.Content"
-                    xmlns:sys="using:System">
+                    xmlns:sys="using:System"
+                    xmlns:suki="https://github.com/kikipoulet/SukiUI">
     <Design.PreviewWith>
         <Border Height="500" Padding="20">
             <StackPanel VerticalAlignment="Center" Spacing="20">
@@ -59,7 +60,7 @@
 
     <ControlTheme x:Key="{x:Type TimePicker}" TargetType="TimePicker">
         <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
-        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="BorderThickness" Value="0,0,0,0" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiMediumBorderBrush}" />
@@ -71,6 +72,8 @@
             <ControlTemplate>
                 <DataValidationErrors>
                     <Grid Name="LayoutRoot">
+                        <suki:GlassCard Height="{TemplateBinding Height}" CornerRadius="{DynamicResource SmallCornerRadius}" Classes="Discrete" >
+
                         <Button x:Name="PART_FlyoutButton"
                                 MinWidth="{DynamicResource TimePickerThemeMinWidth}"
                                 MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
@@ -144,7 +147,7 @@
                                 </Grid>
                             </DockPanel>
                         </Button>
-
+</suki:GlassCard>
                         <Popup Name="PART_Popup"
                                IsLightDismissEnabled="True"
                                Placement="Bottom"