Browse Source

Added missing icons

flabbet 1 year ago
parent
commit
ead8752e27

+ 3 - 2
src/PixiEditor.UI.Common/Fonts/PixiPerfectIcons.axaml

@@ -113,11 +113,12 @@
             <system:String x:Key="icon-hard-drive">&#xE96C;</system:String>
             <system:String x:Key="icon-hard-drive">&#xE96C;</system:String>
             <system:String x:Key="icon-copy-add">&#xe921;</system:String>
             <system:String x:Key="icon-copy-add">&#xe921;</system:String>
             <system:String x:Key="icon-check">&#xe96a;</system:String>
             <system:String x:Key="icon-check">&#xe96a;</system:String>
+            <system:String x:Key="icon-dot">&#xe963;</system:String>
             
             
             <system:String x:Key="icon-paste-reference-layer">&#xe977;</system:String>
             <system:String x:Key="icon-paste-reference-layer">&#xe977;</system:String>
             <system:String x:Key="icon-paste-as-new-layer">&#xe978;</system:String>
             <system:String x:Key="icon-paste-as-new-layer">&#xe978;</system:String>
-            <system:String x:Key="icon-star">&#x25a1;</system:String>
-            <system:String x:Key="icon-star-filled">&#xfffd;</system:String>
+            <system:String x:Key="icon-star">&#xe97c;</system:String>
+            <system:String x:Key="icon-star-filled">&#xe979;</system:String>
             <system:String x:Key="icon-reset">R</system:String>
             <system:String x:Key="icon-reset">R</system:String>
             <system:String x:Key="icon-message">&#xE96F;</system:String>
             <system:String x:Key="icon-message">&#xE96F;</system:String>
             <system:String x:Key="icon-download">&#xE969;</system:String>
             <system:String x:Key="icon-download">&#xE969;</system:String>

+ 1 - 0
src/PixiEditor.UI.Common/Fonts/PixiPerfectIcons.axaml.cs

@@ -122,6 +122,7 @@ public static class PixiPerfectIcons
     public const string Pause = "\uE980";
     public const string Pause = "\uE980";
     public const string Swatches = "\uE982";
     public const string Swatches = "\uE982";
     public const string Timeline = "\uE983";
     public const string Timeline = "\uE983";
+    public const string Dot = "\uE963";
         
         
     public const string Reset = "R"; // TODO: Create a reset icon
     public const string Reset = "R"; // TODO: Create a reset icon
     public const string ToggleLayerVisible = "\u25a1;"; // TODO: Create a toggle layer visible icon
     public const string ToggleLayerVisible = "\u25a1;"; // TODO: Create a toggle layer visible icon

+ 18 - 16
src/PixiEditor/Styles/PortingWipStyles.axaml

@@ -1,6 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="clr-namespace:PixiEditor.Helpers.Converters">
+        xmlns:converters="clr-namespace:PixiEditor.Helpers.Converters"
+        xmlns:rendering="clr-namespace:PixiEditor.UI.Common.Rendering;assembly=PixiEditor.UI.Common">
     <Design.PreviewWith>
     <Design.PreviewWith>
         <Border Padding="20">
         <Border Padding="20">
             <!-- Add Controls for Previewer Here -->
             <!-- Add Controls for Previewer Here -->
@@ -64,10 +65,10 @@
         <Setter Property="Content" Value="{DynamicResource icon-pause}" />
         <Setter Property="Content" Value="{DynamicResource icon-pause}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Background" Value="Transparent" />
     </Style>
     </Style>
-    
+
     <Style Selector="ToggleButton.PlayButton:pressed">
     <Style Selector="ToggleButton.PlayButton:pressed">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Background" Value="Transparent" />
-   </Style> 
+    </Style>
     <Style Selector="ToggleButton.ExpandCollapseToggleStyle">
     <Style Selector="ToggleButton.ExpandCollapseToggleStyle">
         <Setter Property="Content" Value="{DynamicResource icon-chevron-down}" />
         <Setter Property="Content" Value="{DynamicResource icon-chevron-down}" />
         <Setter Property="Template">
         <Setter Property="Template">
@@ -80,14 +81,14 @@
             </Setter.Value>
             </Setter.Value>
         </Setter>
         </Setter>
     </Style>
     </Style>
-    
+
     <Style Selector="ToggleButton.ExpandCollapseToggleStyle:pressed">
     <Style Selector="ToggleButton.ExpandCollapseToggleStyle:pressed">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Background" Value="Transparent" />
     </Style>
     </Style>
-    
+
     <Style Selector="ToggleButton.ExpandCollapseToggleStyle:checked">
     <Style Selector="ToggleButton.ExpandCollapseToggleStyle:checked">
         <Setter Property="Content" Value="{DynamicResource icon-chevron-left}" />
         <Setter Property="Content" Value="{DynamicResource icon-chevron-left}" />
-        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Background" Value="Transparent" />
     </Style>
     </Style>
 
 
     <Style Selector="Button.SocialMediaButton">
     <Style Selector="Button.SocialMediaButton">
@@ -132,22 +133,23 @@
                     <!--TODO: After toggling on and off, weird visual glitch appears on the corner of rounded anchor-->
                     <!--TODO: After toggling on and off, weird visual glitch appears on the corner of rounded anchor-->
                     <Border CornerRadius="{TemplateBinding CornerRadius}"
                     <Border CornerRadius="{TemplateBinding CornerRadius}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderBrush="{TemplateBinding BorderBrush}"
+                            Background="Transparent"
                             BorderThickness="{TemplateBinding BorderThickness}">
                             BorderThickness="{TemplateBinding BorderThickness}">
-                        <Border.Background>
-                            <!--<ImageBrush Source="/Images/AnchorDot.png" />-->
-                        </Border.Background>
                         <Border.Transitions>
                         <Border.Transitions>
                             <Transitions>
                             <Transitions>
                                 <BrushTransition Duration="0:0:0.1" Property="BorderBrush" />
                                 <BrushTransition Duration="0:0:0.1" Property="BorderBrush" />
                             </Transitions>
                             </Transitions>
                         </Border.Transitions>
                         </Border.Transitions>
-                        <ContentPresenter Padding="{TemplateBinding Padding}"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          RecognizesAccessKey="True"
-                                          TextElement.Foreground="{TemplateBinding Foreground}" />
+                        <Grid>
+                            <TextBlock Text="{DynamicResource icon-dot}" VerticalAlignment="Center" HorizontalAlignment="Center" Classes="pixi-icon"/>
+                            <ContentPresenter Padding="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              RecognizesAccessKey="True"
+                                              TextElement.Foreground="{TemplateBinding Foreground}" />
+                        </Grid>
                     </Border>
                     </Border>
                 </ControlTemplate>
                 </ControlTemplate>
             </Setter.Value>
             </Setter.Value>