Fixed flabbet's requests

PixiEditor · May 5, 2023 · 8b57dde · 8b57dde
1 parent 88efb07
commit 8b57dde
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/src/PixiEditor/Data/Localization/Languages/en.json b/src/PixiEditor/Data/Localization/Languages/en.json
@@ -590,6 +590,9 @@
   "IMPORT_AS_REFERENCE_LAYER": "Import as reference layer",
   "NAVIGATOR_PICK_ACTION_DISPLAY": "Right-click to pick color, Shift-right-click to copy color to clipboard",
 
+  "OPEN_FILE_FROM_CLIPBOARD": "Open from clipboard",
+  "OPEN_FILE_FROM_CLIPBOARD_DESCRIPTIVE": "Open from clipboard",
+
   "OPEN_LOCALIZATION_DEBUG_WINDOW": "Open Localization Debug Window",
   "FORCE_OTHER_FLOW_DIRECTION": "Force other flow direction",
   "API_KEY": "API Key",

diff --git a/src/PixiEditor/Styles/Titlebar.xaml b/src/PixiEditor/Styles/Titlebar.xaml
@@ -46,7 +46,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
                     <Grid x:Name="LayoutRoot" Background="Transparent" Width="44" Height="35">
-                        <TextBlock x:Name="txt" Text="{TemplateBinding Content}" FontFamily="{DynamicResource NativeIconFont}"
+                        <TextBlock x:Name="txt" Text="{TemplateBinding Content}" FontFamily="Segoe MDL2 Assets"
                                    Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"
                                    RenderOptions.ClearTypeHint="Auto" TextOptions.TextRenderingMode="Aliased"
                                    TextOptions.TextFormattingMode="Display" />

diff --git a/src/PixiEditor/ViewModels/SubViewModels/Document/DocumentViewModel.cs b/src/PixiEditor/ViewModels/SubViewModels/Document/DocumentViewModel.cs
@@ -405,7 +405,7 @@ public Color PickColor(VecD pos, DocumentScope scope, bool includeReference, boo
                 return ColorHelpers.BlendColors(referenceColor, canvasColor);
             }
 
-            byte referenceAlpha = canvasColor.A == 0 ? referenceColor.A : (byte)(referenceColor.A * 0.6f);
+            byte referenceAlpha = canvasColor.A == 0 ? referenceColor.A : (byte)(referenceColor.A * ReferenceLayerViewModel.TopMostOpacity);
 
             referenceColor = new Color(referenceColor.R, referenceColor.G, referenceColor.B, referenceAlpha);
             return ColorHelpers.BlendColors(canvasColor, referenceColor);

diff --git a/src/PixiEditor/ViewModels/SubViewModels/Document/ReferenceLayerViewModel.cs b/src/PixiEditor/ViewModels/SubViewModels/Document/ReferenceLayerViewModel.cs
@@ -18,6 +18,8 @@ internal class ReferenceLayerViewModel : INotifyPropertyChanged
     private readonly DocumentViewModel doc;
     private readonly DocumentInternalParts internals;
     public event PropertyChangedEventHandler PropertyChanged;
+
+    public const float TopMostOpacity = 0.6f;
 
     public WriteableBitmap? ReferenceBitmap { get; private set; }
 

diff --git a/src/PixiEditor/ViewModels/SubViewModels/Main/FileViewModel.cs b/src/PixiEditor/ViewModels/SubViewModels/Main/FileViewModel.cs
@@ -143,7 +143,7 @@ public void OpenFromOpenFileDialog()
         OpenFromPath(dialog.FileName);
     }
 
-    [Command.Basic("PixiEditor.File.OpenFileFromClipboard", "Open from clipboard", "Open from clipboard", CanExecute = "PixiEditor.Clipboard.HasImageInClipboard")]
+    [Command.Basic("PixiEditor.File.OpenFileFromClipboard", "OPEN_FILE_FROM_CLIPBOARD", "OPEN_FILE_FROM_CLIPBOARD_DESCRIPTIVE", CanExecute = "PixiEditor.Clipboard.HasImageInClipboard")]
     public void OpenFromClipboard()
     {
         var images = ClipboardController.GetImagesFromClipboard();

diff --git a/src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/PenToolViewModel.cs b/src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/PenToolViewModel.cs
@@ -52,7 +52,7 @@ private void SelectedToolChanged(object sender, SelectedToolEventArgs e)
             if (e.NewTool == this && PixelPerfectEnabled)
             {
                 var toolbar = (BasicToolbar)Toolbar;
-                var setting = (SizeSetting)toolbar.Settings[0];
+                var setting = (SizeSetting)toolbar.Settings.First(x => x.Name == "ToolSize");
                 setting.Value = 1;
             }
 

diff --git a/src/PixiEditor/Views/Dialogs/HelloTherePopup.xaml b/src/PixiEditor/Views/Dialogs/HelloTherePopup.xaml
@@ -209,7 +209,7 @@
                                                             <Button Command="{Binding DataContext.OpenInExplorerCommand, RelativeSource={RelativeSource AncestorType=uc:AlignableWrapPanel}}"
                                                                     CommandParameter="{Binding FilePath}"
                                                                     ToolTip="Open in File Explorer">
-                                                                <TextBlock Text="&#xEC50;" FontFamily="{DynamicResource NativeIconFont}"
+                                                                <TextBlock Text="&#xEC50;" FontFamily="Segoe MDL2 Assets"
                                                                            TextAlignment="Center" FontSize="18"/>
                                                             </Button>
                                                             <Button Command="{cmds:Command Name=PixiEditor.File.RemoveRecent, UseProvided=True}"

diff --git a/src/PixiEditor/Views/UserControls/Viewport.xaml b/src/PixiEditor/Views/UserControls/Viewport.xaml
@@ -20,6 +20,7 @@
     xmlns:cmds="clr-namespace:PixiEditor.Models.Commands.XAML"
     xmlns:tools ="clr-namespace:PixiEditor.ViewModels.SubViewModels.Tools.Tools"
     xmlns:views="clr-namespace:PixiEditor.Views"
+    xmlns:subviews="clr-namespace:PixiEditor.ViewModels.SubViewModels.Document"
     mc:Ignorable="d"
     x:Name="vpUc"
     d:DesignHeight="450"
@@ -152,7 +153,7 @@
                         Visibility="{Binding Source={vm:ToolVM ColorPickerToolViewModel}, Path=PickFromReferenceLayer, Converter={converters:BoolToVisibilityConverter}}"
                         ZIndex="{Binding Document.ReferenceLayerViewModel.ShowHighest, Converter={converters:BoolToIntConverter}}"
                         IsHitTestVisible="{Binding Document.ReferenceLayerViewModel.IsTransforming}"
-                        Opacity="{Binding Document.ReferenceLayerViewModel.ShowHighest, Converter={converters:BoolToValueConverter FalseValue=1.0, TrueValue=0.6}}">
+                        Opacity="{Binding Document.ReferenceLayerViewModel.ShowHighest, Converter={converters:BoolToValueConverter FalseValue=1.0, TrueValue={x:Static subviews:ReferenceLayerViewModel.TopMostOpacity}}}">
                         <Image
                             Focusable="False"
                             Width="{Binding Document.ReferenceLayerViewModel.ReferenceBitmap.Width}"