Merge pull request #18146 from meeseeksmachine/auto-backport-of-pr-17989-on-v3.3.x

jklymak · web-flow · commit 6cfbb4c65416 · 2020-08-02T08:46:17.000-07:00
Backport PR #17989 on branch v3.3.x (gtk/tk: Ensure no flicker when hovering over images.)
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -518,6 +518,14 @@ def __init__(self, canvas, window, *, pack_toolbar=True):
                 if tooltip_text is not None:
                     ToolTip.createToolTip(button, tooltip_text)
 
+        # This filler item ensures the toolbar is always at least two text
+        # lines high. Otherwise the canvas gets redrawn as the mouse hovers
+        # over images because those use two-line messages which resize the
+        # toolbar.
+        label = tk.Label(master=self,
+                         text='\N{NO-BREAK SPACE}\n\N{NO-BREAK SPACE}')
+        label.pack(side=tk.RIGHT)
+
         self.message = tk.StringVar(master=self)
         self._message_label = tk.Label(master=self, textvariable=self.message)
         self._message_label.pack(side=tk.RIGHT)
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -521,6 +521,17 @@ def __init__(self, canvas, window):
         toolitem.set_draw(False)
         toolitem.set_expand(True)
 
+        # This filler item ensures the toolbar is always at least two text
+        # lines high. Otherwise the canvas gets redrawn as the mouse hovers
+        # over images because those use two-line messages which resize the
+        # toolbar.
+        toolitem = Gtk.ToolItem()
+        self.insert(toolitem, -1)
+        label = Gtk.Label()
+        label.set_markup(
+            '<small>\N{NO-BREAK SPACE}\n\N{NO-BREAK SPACE}</small>')
+        toolitem.add(label)
+
         toolitem = Gtk.ToolItem()
         self.insert(toolitem, -1)
         self.message = Gtk.Label()
@@ -536,7 +547,8 @@ def ctx(self):
         return self.canvas.get_property("window").cairo_create()
 
     def set_message(self, s):
-        self.message.set_label(s)
+        escaped = GLib.markup_escape_text(s)
+        self.message.set_markup(f'<small>{escaped}</small>')
 
     def set_cursor(self, cursor):
         window = self.canvas.get_property("window")
