[aseprite] 44/64: Enable Edit > Copy anyway if layer is locked/non-editable

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit d371352526325491cf05a617500e7f33bfd6ac8e
Author: David Capello <davidcapello at gmail.com>
Date:   Thu May 19 13:22:58 2016 -0300

    Enable Edit > Copy anyway if layer is locked/non-editable
---
 src/app/ui/document_view.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/ui/document_view.cpp b/src/app/ui/document_view.cpp
index 17571e9..48f9af2 100644
--- a/src/app/ui/document_view.cpp
+++ b/src/app/ui/document_view.cpp
@@ -425,14 +425,22 @@ void DocumentView::onNewInputPriority(InputChainElement* element)
 
 bool DocumentView::onCanCut(Context* ctx)
 {
-  return onCanCopy(ctx);
+  if (ctx->checkFlags(ContextFlags::ActiveDocumentIsWritable |
+                      ContextFlags::ActiveLayerIsVisible |
+                      ContextFlags::ActiveLayerIsEditable |
+                      ContextFlags::HasVisibleMask |
+                      ContextFlags::HasActiveImage))
+    return true;
+  else if (m_editor->isMovingPixels())
+    return true;
+  else
+    return false;
 }
 
 bool DocumentView::onCanCopy(Context* ctx)
 {
   if (ctx->checkFlags(ContextFlags::ActiveDocumentIsWritable |
                       ContextFlags::ActiveLayerIsVisible |
-                      ContextFlags::ActiveLayerIsEditable |
                       ContextFlags::HasVisibleMask |
                       ContextFlags::HasActiveImage))
     return true;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git