From 7864adbc0c36f81c614e3a7c11c8b9a553ee2583 Mon Sep 17 00:00:00 2001
From: blink1073 <steven.silvester@ieee.org>
Date: Sun, 20 Jul 2014 19:29:39 -0500
Subject: [PATCH] Make other suggested style changes

---
 skimage/viewer/viewers/core.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/skimage/viewer/viewers/core.py b/skimage/viewer/viewers/core.py
index 6dc4a7a5..52e2259f 100644
--- a/skimage/viewer/viewers/core.py
+++ b/skimage/viewer/viewers/core.py
@@ -98,8 +98,7 @@ class EventManager(object):
         for tool in self.tools:
             if not tool.ignore(event) and tool.hit_test(event):
                 self.active_tool = tool
-                tool.on_mouse_press(event)
-                return
+                break
         if self.active_tool and not self.active_tool.ignore(event):
             self.active_tool.on_mouse_press(event)
             return
@@ -110,25 +109,23 @@ class EventManager(object):
                 return
 
     def on_key_press(self, event):
-        tool = self.get_tool()
-        if not tool is None and not tool.ignore(event):
+        tool = self._get_tool(event)
+        if not tool is None:
             tool.on_key_press(event)
 
-    def get_tool(self):
-        if not self.tools:
-            return
-        if self.active_tool is None:
-            self.active_tool = self.tools[0]
+    def _get_tool(self, event):
+        if not self.tools or self.active_tool.ignore(event):
+            return None
         return self.active_tool
 
     def on_mouse_release(self, event):
-        tool = self.get_tool()
-        if not tool is None and not tool.ignore(event):
+        tool = self._get_tool(event)
+        if not tool is None:
             tool.on_mouse_release(event)
 
     def on_move(self, event):
-        tool = self.get_tool()
-        if not tool is None and not tool.ignore(event):
+        tool = self._get_tool(event)
+        if not tool is None:
             tool.on_move(event)