[aseprite] 09/134: Arrow keys move the selection only when the current tool/ink is about selection

[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 2d8303e174b9478fe0a2217e8ed38fac71cac557
Author: David Capello <davidcapello at gmail.com>
Date:   Sat Oct 25 13:46:55 2014 -0300

    Arrow keys move the selection only when the current tool/ink is about selection
    
    This fix a problem where arrow keys cleared the selection content when they
    were used with a non-selection tool.
---
 src/app/modules/gui.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/modules/gui.cpp b/src/app/modules/gui.cpp
index b372e8a..1f94ac9 100644
--- a/src/app/modules/gui.cpp
+++ b/src/app/modules/gui.cpp
@@ -157,10 +157,13 @@ static void save_gui_config();
 
 static KeyContext get_current_keycontext()
 {
-  DocumentLocation location = UIContext::instance()->activeLocation();
-  Document* document = location.document();
+  app::Context* ctx = UIContext::instance();
+  DocumentLocation location = ctx->activeLocation();
+  Document* doc = location.document();
 
-  if (document && document->isMaskVisible())
+  if (doc &&
+      doc->isMaskVisible() &&
+      ctx->settings()->getCurrentTool()->getInk(0)->isSelection())
     return KeyContext::Selection;
   else
     return KeyContext::Normal;

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