From dae562e20bfefb0ac3e9fe07268c99cd80c5adad Mon Sep 17 00:00:00 2001 From: luboslenco Date: Wed, 15 Jan 2020 21:34:56 +0100 Subject: [PATCH] Allow setting clone source in 2D view --- Sources/arm/ui/UITrait.hx | 6 ++++-- Sources/arm/ui/UIView2D.hx | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Sources/arm/ui/UITrait.hx b/Sources/arm/ui/UITrait.hx index 75c4af5a..01ea2031 100644 --- a/Sources/arm/ui/UITrait.hx +++ b/Sources/arm/ui/UITrait.hx @@ -636,8 +636,10 @@ class UITrait { var mouse = Input.getMouse(); var kb = Input.getKeyboard(); + var setCloneSource = Context.tool == ToolClone && Operator.shortcut("alt+" + Config.keymap.action_paint); + var down = Operator.shortcut(Config.keymap.action_paint) || - (Operator.shortcut("alt+" + Config.keymap.action_paint) && Context.tool == ToolClone) || + setCloneSource || Operator.shortcut(Config.keymap.brush_ruler + "+" + Config.keymap.action_paint) || (Input.getPen().down() && !kb.down("alt")); if (down) { @@ -648,7 +650,7 @@ class UITrait { if (mx < iron.App.w() && mx > iron.App.x() && my < iron.App.h() && my > iron.App.y()) { - if (Context.tool == ToolClone && kb.down("alt")) { // Clone source + if (setCloneSource) { cloneStartX = mx; cloneStartY = my; } diff --git a/Sources/arm/ui/UIView2D.hx b/Sources/arm/ui/UIView2D.hx index c589cbd0..545d2f02 100644 --- a/Sources/arm/ui/UIView2D.hx +++ b/Sources/arm/ui/UIView2D.hx @@ -232,9 +232,12 @@ class UIView2D { if (panScale > 3.0) panScale = 3.0; } + var setCloneSource = Context.tool == ToolClone && Operator.shortcut("alt+" + Config.keymap.action_paint); + if (type == View2DLayer && (Operator.shortcut(Config.keymap.action_paint) || - Operator.shortcut(Config.keymap.brush_ruler + "+" + Config.keymap.action_paint))) { + Operator.shortcut(Config.keymap.brush_ruler + "+" + Config.keymap.action_paint) || + setCloneSource)) { UITrait.inst.paint2d = true; }