[aseprite] 62/128: Update the status bar depending on the Editor text when the tool changes

[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 97ebd700485bfa94a4a669948030844a4114d5b8
Author: David Capello <davidcapello at gmail.com>
Date:   Mon Apr 25 16:17:30 2016 -0300

    Update the status bar depending on the Editor text when the tool changes
    
    It fixes a problem were PaletteView was clearing the StatusBar set by
    the Editor when a quicktool keyboard shortcut was pressed.
---
 src/app/ui/editor/editor.cpp | 1 +
 src/app/ui/palette_view.cpp  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
index 7de475f..34cc229 100644
--- a/src/app/ui/editor/editor.cpp
+++ b/src/app/ui/editor/editor.cpp
@@ -1362,6 +1362,7 @@ void Editor::onInvalidateRegion(const gfx::Region& region)
 void Editor::onActiveToolChange(tools::Tool* tool)
 {
   m_state->onActiveToolChange(this, tool);
+  updateStatusBar();
 }
 
 void Editor::onFgColorChange()
diff --git a/src/app/ui/palette_view.cpp b/src/app/ui/palette_view.cpp
index 29abad1..696a2f5 100644
--- a/src/app/ui/palette_view.cpp
+++ b/src/app/ui/palette_view.cpp
@@ -280,7 +280,8 @@ bool PaletteView::onProcessMessage(Message* msg)
     case kKeyDownMessage:
     case kKeyUpMessage:
     case kMouseEnterMessage:
-      updateCopyFlag(msg);
+      if (hasMouse())
+        updateCopyFlag(msg);
       break;
 
     case kMouseDownMessage:

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