Forráskód Böngészése

Commented out code that will be todo: v0.2

flabbet 3 éve
szülő
commit
1225e5f959

+ 1 - 1
PixiEditor/Models/DataHolders/Document/Document.Operations.cs

@@ -163,7 +163,7 @@ namespace PixiEditor.Models.DataHolders
 
             int biggerMaxSize = Math.Max(Width, Height);
 
-
+            // TODO: Fix v0.2
             foreach (var layer in Layers)
             {
                 using (new SKAutoCanvasRestore(layer.LayerBitmap.SkiaSurface.Canvas, true))

+ 15 - 15
PixiEditor/Models/Tools/Tools/ColorPickerTool.cs

@@ -52,12 +52,12 @@ namespace PixiEditor.Models.Tools.Tools
 
                 color = referenceLayer.LayerBitmap.GetSRGBPixel(x, y);
 
-                if ((Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt)) && color != null)
-                {
-                    // TODO: Blend colors
-                    throw new NotImplementedException();
-                    //SKColor? canvasColor = _docProvider.GetRenderer()?.FinalSurface.GetSRGBPixel(x, y);
-                }
+                //if ((Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt)) && color != null)
+                //{
+                //    // TODO: Blend colors
+                //    throw new NotImplementedException();
+                //    //SKColor? canvasColor = _docProvider.GetRenderer()?.FinalSurface.GetSRGBPixel(x, y);
+                //}
             }
             else
             {
@@ -90,15 +90,15 @@ namespace PixiEditor.Models.Tools.Tools
 
         private void UpdateActionDisplay()
         {
-            if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
+            if (Keyboard.IsKeyDown(Key.LeftCtrl) /*|| Keyboard.IsKeyDown(Key.RightCtrl)*/)
             {
-                if (Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt))
-                {
-                    _bitmapManager.HideReferenceLayer = false;
-                    _bitmapManager.OnlyReferenceLayer = false;
-                    ActionDisplay = "Press on a pixel to make the blend of the reference and canvas the primary color. Release Ctrl and Alt to pick from the canvas. Release just Alt to pick from the reference";
-                    return;
-                }
+                //if (Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt))
+                //{
+                //    _bitmapManager.HideReferenceLayer = false;
+                //    _bitmapManager.OnlyReferenceLayer = false;
+                //    ActionDisplay = "Press on a pixel to make the blend of the reference and canvas the primary color. Release Ctrl and Alt to pick from the canvas. Release just Alt to pick from the reference";
+                //    return;
+                //}
 
                 _bitmapManager.HideReferenceLayer = false;
                 _bitmapManager.OnlyReferenceLayer = true;
@@ -108,7 +108,7 @@ namespace PixiEditor.Models.Tools.Tools
             {
                 _bitmapManager.HideReferenceLayer = true;
                 _bitmapManager.OnlyReferenceLayer = false;
-                ActionDisplay = "Press on a pixel to make it the primary color. Hold Ctrl to pick from the reference. Hold Ctrl and Alt to blend the reference and canvas color";
+                ActionDisplay = "Press on a pixel to make it the primary color. Hold Ctrl to pick from the reference.";
             }
         }
     }

+ 3 - 2
PixiEditor/Views/MainWindow.xaml

@@ -134,7 +134,7 @@
                     <MenuItem Header="_Clip Canvas" Command="{Binding DocumentSubViewModel.ClipCanvasCommand}" />
                     <Separator/>
                     <MenuItem Header="_Center Content" Command="{Binding DocumentSubViewModel.CenterContentCommand}" />
-                    <Separator/>
+                    <!--<Separator/>
                     <MenuItem Header="_Rotate to right 90&#186;" Command="{Binding DocumentSubViewModel.RotateToRightCommand}">
                         <MenuItem.CommandParameter>
                             <sys:Double>90</sys:Double>
@@ -148,7 +148,8 @@
                     <Separator/>
                     <MenuItem Header="_Flip Horizontal" Command="{Binding DocumentSubViewModel.FlipCommand}" CommandParameter="Horizontal"/>
                     <MenuItem Header="_Flip Vertical" Command="{Binding DocumentSubViewModel.FlipCommand}" CommandParameter="Vertical"/>
-                </MenuItem>
+                -->
+                    </MenuItem> 
                 <MenuItem Header="_View">
                     <MenuItem Header="_Show Grid Lines" IsChecked="{Binding ViewportSubViewModel.GridLinesEnabled, Mode=TwoWay}"
                               IsCheckable="True" InputGestureText="Ctrl+`"/>