From 4176b7ffbae6e382ed694a5ea60d167ea5f6b71b Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Mon, 2 Jan 2023 20:41:11 +0100 Subject: [PATCH] Skip displaying pan/zoom navigate mode in toolbar. It doesn't add much over the button state and the button tooltip (note that the state isn't even displayed when the cursor is over an axes, as the coordinates take precedence), and collides with other possible end-user customizations of the toolbar (currently, end-users can override the coordinate string via format_coord, but not the navigate mode string). --- lib/matplotlib/backend_bases.py | 10 ++-------- lib/matplotlib/backend_tools.py | 2 -- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index db92346d201e..16ce51cd600e 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -3150,15 +3150,11 @@ def _mouse_event_to_message(event): if data_str: s = s + '\n' + data_str return s + return "" def mouse_move(self, event): self._update_cursor(event) - - s = self._mouse_event_to_message(event) - if s is not None: - self.set_message(s) - else: - self.set_message(self.mode) + self.set_message(self._mouse_event_to_message(event)) def _zoom_pan_handler(self, event): if self.mode == _Mode.PAN: @@ -3189,7 +3185,6 @@ def pan(self, *args): self.canvas.widgetlock(self) for a in self.canvas.figure.get_axes(): a.set_navigate_mode(self.mode._navigate_mode) - self.set_message(self.mode) _PanInfo = namedtuple("_PanInfo", "button axes cid") @@ -3245,7 +3240,6 @@ def zoom(self, *args): self.canvas.widgetlock(self) for a in self.canvas.figure.get_axes(): a.set_navigate_mode(self.mode._navigate_mode) - self.set_message(self.mode) _ZoomInfo = namedtuple("_ZoomInfo", "direction start_xy axes cid cbar") diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py index fbe7a157d4db..73425f915093 100644 --- a/lib/matplotlib/backend_tools.py +++ b/lib/matplotlib/backend_tools.py @@ -336,8 +336,6 @@ def send_message(self, event): from matplotlib.backend_bases import NavigationToolbar2 message = NavigationToolbar2._mouse_event_to_message(event) - if message is None: - message = ' ' self.toolmanager.message_event(message, self)