diff options
| author | Tiago Conceição <Tiago_caza@hotmail.com> | 2020-09-15 20:44:45 +0300 |
|---|---|---|
| committer | Tiago Conceição <Tiago_caza@hotmail.com> | 2020-09-15 20:44:45 +0300 |
| commit | 2ca4bfe5995b3b426f0c15d02ca38a3f80113b3b (patch) | |
| tree | d8f91f7978da3f187e249cb2bd78bc3c7da587bc /UVtools.GUI | |
| parent | 9d63056fcf4d8b5e1e3805ef0fc488918c60bfc8 (diff) | |
Fixes Move and Pattern
* (Fix) Tools - Move and Pattern: When not selecting a ROI will draw black layers
* (Fix) Tool - Move: When making a cut move and move to a overlap zone it will blackout the source rectangle
Diffstat (limited to 'UVtools.GUI')
| -rw-r--r-- | UVtools.GUI/Controls/CtrlToolWindowContent.cs | 2 | ||||
| -rw-r--r-- | UVtools.GUI/Controls/Tools/CtrlToolMove.cs | 16 | ||||
| -rw-r--r-- | UVtools.GUI/Properties/AssemblyInfo.cs | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/UVtools.GUI/Controls/CtrlToolWindowContent.cs b/UVtools.GUI/Controls/CtrlToolWindowContent.cs index bfaf348..8fb319c 100644 --- a/UVtools.GUI/Controls/CtrlToolWindowContent.cs +++ b/UVtools.GUI/Controls/CtrlToolWindowContent.cs @@ -166,7 +166,7 @@ namespace UVtools.GUI.Controls if (ParentToolWindow is null) return true; BaseOperation.LayerIndexStart = ParentToolWindow.LayerRangeStart; BaseOperation.LayerIndexEnd = ParentToolWindow.LayerRangeEnd; - if (CanROI) + if (CanROI && BaseOperation.ROI.IsEmpty) { BaseOperation.ROI = Program.FrmMain.ROI; } diff --git a/UVtools.GUI/Controls/Tools/CtrlToolMove.cs b/UVtools.GUI/Controls/Tools/CtrlToolMove.cs index e9746e4..d4c96e4 100644 --- a/UVtools.GUI/Controls/Tools/CtrlToolMove.cs +++ b/UVtools.GUI/Controls/Tools/CtrlToolMove.cs @@ -17,6 +17,7 @@ namespace UVtools.GUI.Controls.Tools { public OperationMove Operation { get; } + private RadioButton[] radioButtons; public CtrlToolMove() { @@ -28,6 +29,13 @@ namespace UVtools.GUI.Controls.Tools (uint)Program.FrmMain.ActualLayerImage.Height); SetOperation(Operation); + radioButtons = new[] + { + rbAnchorTopLeft, rbAnchorTopCenter, rbAnchorTopRight, + rbAnchorMiddleLeft, rbAnchorMiddleCenter, rbAnchorMiddleRight, + rbAnchorBottomLeft, rbAnchorBottomCenter, rbAnchorBottomRight + }; + cbMoveType.SelectedIndex = 0; ExtraActionCall(this); } @@ -70,12 +78,7 @@ namespace UVtools.GUI.Controls.Tools { base.UpdateOperation(); byte i = 0; - foreach (var radioButton in new[] - { - rbAnchorTopLeft, rbAnchorTopCenter, rbAnchorTopRight, - rbAnchorMiddleLeft, rbAnchorMiddleCenter, rbAnchorMiddleRight, - rbAnchorBottomLeft, rbAnchorBottomCenter, rbAnchorBottomRight - }) + foreach (var radioButton in radioButtons) { if (radioButton.Checked) { @@ -91,6 +94,7 @@ namespace UVtools.GUI.Controls.Tools Operation.MarginRight = (int)nmMarginRight.Value; Operation.MarginBottom = (int)nmMarginBottom.Value; Operation.IsCutMove = cbMoveType.SelectedIndex == 0; + return true; } } diff --git a/UVtools.GUI/Properties/AssemblyInfo.cs b/UVtools.GUI/Properties/AssemblyInfo.cs index 9bf24f4..442aef9 100644 --- a/UVtools.GUI/Properties/AssemblyInfo.cs +++ b/UVtools.GUI/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.8.2.1")] -[assembly: AssemblyFileVersion("0.8.2.1")] +[assembly: AssemblyVersion("0.8.2.2")] +[assembly: AssemblyFileVersion("0.8.2.2")] |