Browse Source

Changed ToolTip and HideHighlight property

CPKreuz 4 years ago
parent
commit
f564377bad

+ 2 - 2
PixiEditor/Models/Tools/Tool.cs

@@ -21,9 +21,9 @@ namespace PixiEditor.Models.Tools
 
         public virtual string ImagePath => $"/Images/Tools/{ToolName}Image.png";
 
-        public bool HideHighlight { get; set; } = false;
+        public virtual bool HideHighlight { get; }
 
-        public string Tooltip { get; set; }
+        public abstract string Tooltip { get; }
 
         public string ActionDisplay
         {

+ 3 - 2
PixiEditor/Models/Tools/Tools/BrightnessTool.cs

@@ -18,15 +18,16 @@ namespace PixiEditor.Models.Tools.Tools
     {
         private const float CorrectionFactor = 5f; // Initial correction factor
 
-        private List<Coordinates> pixelsVisited = new List<Coordinates>();
+        private readonly List<Coordinates> pixelsVisited = new List<Coordinates>();
 
         public BrightnessTool()
         {
             ActionDisplay = "Draw on pixel to make it brighter. Hold Ctrl to darken.";
-            Tooltip = "Makes pixel brighter or darker pixel (U). Hold Ctrl to make pixel darker.";
             Toolbar = new BrightnessToolToolbar(CorrectionFactor);
         }
 
+        public override string Tooltip => "Makes pixel brighter or darker pixel (U). Hold Ctrl to make pixel darker.";
+
         public BrightnessMode Mode { get; set; } = BrightnessMode.Default;
 
         public override void OnRecordingLeftMouseDown(MouseEventArgs e)

+ 2 - 1
PixiEditor/Models/Tools/Tools/CircleTool.cs

@@ -16,9 +16,10 @@ namespace PixiEditor.Models.Tools.Tools
         public CircleTool()
         {
             ActionDisplay = "Click and move mouse to draw a circle. Hold Shift to draw an even one.";
-            Tooltip = "Draws circle on canvas (C). Hold Shift to draw even circle.";
         }
 
+        public override string Tooltip => "Draws circle on canvas (C). Hold Shift to draw even circle.";
+
         public override void OnKeyDown(KeyEventArgs e)
         {
             if (e.Key == Key.LeftShift)

+ 4 - 2
PixiEditor/Models/Tools/Tools/ColorPickerTool.cs

@@ -11,11 +11,13 @@ namespace PixiEditor.Models.Tools.Tools
     {
         public ColorPickerTool()
         {
-            HideHighlight = true;
             ActionDisplay = "Press on pixel to make it the primary color.";
-            Tooltip = "Swaps primary color with selected on canvas. (O)";
         }
 
+        public override bool HideHighlight => true;
+
+        public override string Tooltip => "Swaps primary color with selected on canvas. (O)";
+
         public override void OnMouseDown(MouseEventArgs e)
         {
             base.OnMouseDown(e);

+ 2 - 1
PixiEditor/Models/Tools/Tools/EraserTool.cs

@@ -16,11 +16,12 @@ namespace PixiEditor.Models.Tools.Tools
         public EraserTool(BitmapManager bitmapManager)
         {
             ActionDisplay = "Draw to remove color from a pixel.";
-            Tooltip = "Erasers color from pixel. (E)";
             Toolbar = new BasicToolbar();
             pen = new PenTool(bitmapManager);
         }
 
+        public override string Tooltip => "Erasers color from pixel. (E)";
+
         public override LayerChange[] Use(Layer layer, List<Coordinates> coordinates, Color color)
         {
             return Erase(layer, coordinates, Toolbar.GetSetting<SizeSetting>("ToolSize").Value);

+ 2 - 1
PixiEditor/Models/Tools/Tools/FloodFill.cs

@@ -14,10 +14,11 @@ namespace PixiEditor.Models.Tools.Tools
         public FloodFill(BitmapManager bitmapManager)
         {
             ActionDisplay = "Press on a area to fill it.";
-            Tooltip = "Fills area with color. (G)";
             BitmapManager = bitmapManager;
         }
 
+        public override string Tooltip => "Fills area with color. (G)";
+
         public override LayerChange[] Use(Layer layer, List<Coordinates> coordinates, Color color)
         {
             return Only(ForestFire(layer, coordinates[0], color), layer);

+ 2 - 1
PixiEditor/Models/Tools/Tools/LineTool.cs

@@ -18,11 +18,12 @@ namespace PixiEditor.Models.Tools.Tools
         public LineTool()
         {
             ActionDisplay = "Click and move to draw a line. Hold Shift to draw an even one.";
-            Tooltip = "Draws line on canvas (L). Hold Shift to draw even line.";
             Toolbar = new BasicToolbar();
             circleTool = new CircleTool();
         }
 
+        public override string Tooltip => "Draws line on canvas (L). Hold Shift to draw even line.";
+
         public override void OnKeyDown(KeyEventArgs e)
         {
             if (e.Key == Key.LeftShift)

+ 2 - 1
PixiEditor/Models/Tools/Tools/MagicWandTool.cs

@@ -25,6 +25,8 @@ namespace PixiEditor.Models.Tools.Tools
 
         private IEnumerable<Coordinates> oldSelection;
 
+        public override string Tooltip => "Magic Wand (W). Flood's the selection";
+
         private Layer cachedDocument;
 
         public override void OnRecordingLeftMouseDown(MouseEventArgs e)
@@ -72,7 +74,6 @@ namespace PixiEditor.Models.Tools.Tools
 
             Toolbar = new MagicWandToolbar();
 
-            Tooltip = "Magic Wand (W). Flood's the selection";
             ActionDisplay = "Click to flood the selection.";
         }
 

+ 5 - 3
PixiEditor/Models/Tools/Tools/MoveTool.cs

@@ -32,16 +32,18 @@ namespace PixiEditor.Models.Tools.Tools
         public MoveTool(BitmapManager bitmapManager)
         {
             ActionDisplay = "Hold mouse to move selected pixels. Hold Ctrl to move all layers.";
-            Tooltip = "Moves selected pixels (V). Hold Ctrl to move all layers.";
             Cursor = Cursors.Arrow;
-            HideHighlight = true;
             RequiresPreviewLayer = true;
             UseDefaultUndoMethod = true;
 
             BitmapManager = bitmapManager;
         }
 
-        public bool MoveAll { get; set; } = false;
+        public override string Tooltip => "Moves selected pixels (V). Hold Ctrl to move all layers.";
+
+        public override bool HideHighlight => true;
+
+        public bool MoveAll { get; set; }
 
         private BitmapManager BitmapManager { get; }
 

+ 3 - 2
PixiEditor/Models/Tools/Tools/MoveViewportTool.cs

@@ -12,13 +12,14 @@ namespace PixiEditor.Models.Tools.Tools
 
         public MoveViewportTool(ToolsViewModel toolsViewModel)
         {
-            HideHighlight = true;
             Cursor = Cursors.SizeAll;
             ActionDisplay = "Click and move to pan viewport.";
-            Tooltip = "Move viewport. (H)";
 
             ToolsViewModel = toolsViewModel;
         }
+
+        public override bool HideHighlight => true;
+        public override string Tooltip => "Move viewport. (H)";
 
         public override void OnMouseUp(MouseEventArgs e)
         {

+ 3 - 2
PixiEditor/Models/Tools/Tools/PenTool.cs

@@ -21,7 +21,7 @@ namespace PixiEditor.Models.Tools.Tools
         private readonly List<Coordinates> confirmedPixels = new List<Coordinates>();
         private readonly LineTool lineTool;
         private Coordinates[] lastChangedPixels = new Coordinates[3];
-        private byte changedPixelsindex = 0;
+        private byte changedPixelsindex;
 
         private BitmapManager BitmapManager { get; }
 
@@ -29,7 +29,6 @@ namespace PixiEditor.Models.Tools.Tools
         {
             Cursor = Cursors.Pen;
             ActionDisplay = "Click and move to draw.";
-            Tooltip = "Standard brush. (B)";
             Toolbar = new PenToolbar();
             toolSizeSetting = Toolbar.GetSetting<SizeSetting>("ToolSize");
             pixelPerfectSetting = Toolbar.GetSetting<BoolSetting>("PixelPerfectEnabled");
@@ -39,6 +38,8 @@ namespace PixiEditor.Models.Tools.Tools
             lineTool = new LineTool();
         }
 
+        public override string Tooltip => "Standard brush. (B)";
+
         public override void OnRecordingLeftMouseDown(MouseEventArgs e)
         {
             base.OnRecordingLeftMouseDown(e);

+ 2 - 1
PixiEditor/Models/Tools/Tools/RectangleTool.cs

@@ -16,9 +16,10 @@ namespace PixiEditor.Models.Tools.Tools
         public RectangleTool()
         {
             ActionDisplay = "Click and move to draw a rectangle.  Hold Shift to draw square.";
-            Tooltip = "Draws rectangle on canvas (R). Hold Shift to draw square.";
         }
 
+        public override string Tooltip => "Draws rectangle on canvas (R). Hold Shift to draw square.";
+
         public bool Filled { get; set; } = false;
 
         public override void OnKeyDown(KeyEventArgs e)

+ 2 - 1
PixiEditor/Models/Tools/Tools/SelectTool.cs

@@ -30,7 +30,6 @@ namespace PixiEditor.Models.Tools.Tools
         public SelectTool(BitmapManager bitmapManager)
         {
             ActionDisplay = "Click and move to select an area.";
-            Tooltip = "Selects area. (M)";
             Toolbar = new SelectToolToolbar();
             BitmapManager = bitmapManager;
 
@@ -40,6 +39,8 @@ namespace PixiEditor.Models.Tools.Tools
 
         public SelectionType SelectionType { get; set; } = SelectionType.Add;
 
+        public override string Tooltip => "Selects area. (M)";
+
         public override void OnRecordingLeftMouseDown(MouseEventArgs e)
         {
             SelectionType = Toolbar.GetEnumSetting<SelectionType>("SelectMode").Value;

+ 4 - 2
PixiEditor/Models/Tools/Tools/ZoomTool.cs

@@ -11,13 +11,15 @@ namespace PixiEditor.Models.Tools.Tools
 
         public ZoomTool(BitmapManager bitmapManager)
         {
-            HideHighlight = true;
             CanStartOutsideCanvas = true;
             ActionDisplay = "Click and move to zoom. Click to zoom in, hold alt and click to zoom out.";
-            Tooltip = "Zooms viewport (Z). Click to zoom in, hold alt and click to zoom out.";
             BitmapManager = bitmapManager;
         }
 
+        public override bool HideHighlight => true;
+
+        public override string Tooltip => "Zooms viewport (Z). Click to zoom in, hold alt and click to zoom out.";
+
         public override void OnKeyDown(KeyEventArgs e)
         {
             if (e.Key == Key.LeftCtrl)