Skip to content

Commit

Permalink
Changed names
Browse files Browse the repository at this point in the history
  • Loading branch information
@flabbet
flabbet committed Mar 4, 2023
1 parent e1eb448 commit 768ea5a
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/UpdateableChangeExecutor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ internal abstract class UpdateableChangeExecutor

protected Action<UpdateableChangeExecutor>? onEnded;
public virtual ExecutorType Type => ExecutorType.Regular;
public virtual ExecutorStartMode StartMode => ExecutorStartMode.OnSelectTool;
public virtual ExecutorStartMode StartMode => ExecutorStartMode.RightAway;

public void Initialize(DocumentViewModel document, DocumentInternalParts internals, ChangeExecutionController controller, Action<UpdateableChangeExecutor> onEnded)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/Models/Enums/ExecutorType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ internal enum ExecutorType

internal enum ExecutorStartMode
{
OnSelectTool,
RightAway,
OnMouseLeftButtonDown,
}
8 changes: 4 additions & 4 deletions src/PixiEditor/ViewModels/SubViewModels/Main/ToolsViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ public void SetActiveTool(ToolViewModel tool, bool transient)
SelectedToolChanged?.Invoke(this, new SelectedToolEventArgs(LastActionTool, ActiveTool));

//update old tool
LastActionTool?.ModiferKeyChanged(false, false, false);
LastActionTool?.ModifierKeyChanged(false, false, false);
//update new tool
ActiveTool.ModiferKeyChanged(ctrlIsDown, shiftIsDown, altIsDown);
ActiveTool.ModifierKeyChanged(ctrlIsDown, shiftIsDown, altIsDown);
ActiveTool.OnSelected();

tool.IsActive = true;
Expand Down Expand Up @@ -225,11 +225,11 @@ public void LeftMouseButtonDownInlet(VecD canvasPos)

public void ConvertedKeyDownInlet(FilteredKeyEventArgs args)
{
ActiveTool?.ModiferKeyChanged(args.IsCtrlDown, args.IsShiftDown, args.IsAltDown);
ActiveTool?.ModifierKeyChanged(args.IsCtrlDown, args.IsShiftDown, args.IsAltDown);
}

public void ConvertedKeyUpInlet(FilteredKeyEventArgs args)
{
ActiveTool?.ModiferKeyChanged(args.IsCtrlDown, args.IsShiftDown, args.IsAltDown);
ActiveTool?.ModifierKeyChanged(args.IsCtrlDown, args.IsShiftDown, args.IsAltDown);
}
}
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/ToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public bool IsActive

public Toolbar Toolbar { get; set; } = new EmptyToolbar();

public virtual void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown) { }
public virtual void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown) { }
public virtual void OnLeftMouseButtonDown(VecD pos) { }
public virtual void OnSelected()
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/BrightnessToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public BrightnessToolViewModel()

public bool Darken { get; private set; } = false;

public override void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
{
if (!ctrlIsDown)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/ColorPickerToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public override void OnLeftMouseButtonDown(VecD pos)
ViewModelMain.Current?.DocumentManagerSubViewModel.ActiveDocument?.Tools.UseColorPickerTool();
}

public override void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
{
if (ctrlIsDown)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/EllipseToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public EllipseToolViewModel()
public override string Tooltip => $"Draws an ellipse on canvas ({Shortcut}). Hold Shift to draw a circle.";
public bool DrawCircle { get; private set; }

public override void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
{
if (shiftIsDown)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/FloodFillToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public FloodFillToolViewModel()
ActionDisplay = defaultActionDisplay;
}

public override void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
{
if (ctrlIsDown)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/LassoToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public LassoToolViewModel()
private SelectionMode modifierKeySelectionMode = SelectionMode.New;
public SelectionMode ResultingSelectionMode => modifierKeySelectionMode != SelectionMode.New ? modifierKeySelectionMode : SelectMode;

public override void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
{
if (shiftIsDown)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/LineToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public LineToolViewModel()

public bool Snap { get; private set; }

public override void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
{
if (shiftIsDown)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/MoveToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public override void OnLeftMouseButtonDown(VecD pos)
ViewModelMain.Current.DocumentManagerSubViewModel.ActiveDocument?.Tools.UseShiftLayerTool();
}

public override void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
{
if (TransformingSelectedArea)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/RectangleToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public RectangleToolViewModel()

public bool Filled { get; set; } = false;
public bool DrawSquare { get; private set; } = false;
public override void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
{
if (shiftIsDown)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/SelectToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public SelectToolViewModel()
private SelectionMode modifierKeySelectionMode = SelectionMode.New;
public SelectionMode ResultingSelectionMode => modifierKeySelectionMode != SelectionMode.New ? modifierKeySelectionMode : SelectMode;

public override void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
{
if (shiftIsDown)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/ZoomToolViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ZoomToolViewModel()

public override string Tooltip => $"Zooms viewport ({Shortcut}). Click to zoom in, hold alt and click to zoom out.";

public override void ModiferKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
{
if (ctrlIsDown)
{
Expand Down

0 comments on commit 768ea5a

Please sign in to comment.