Skip to content

Improve rubberband rendering in wx and tk #23985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tacaswell merged 3 commits into from
Oct 20, 2022
Merged

Improve rubberband rendering in wx and tk #23985

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f751fb0
Fix rubberband visibility for wx backend
oscargus Sep 22, 2022
1e278c7
Fix rubberband visibility for tk backend
oscargus Sep 22, 2022
0f9b73d
Improve bounds of wx rubberband
oscargus Oct 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix rubberband visibility for tk backend
  • Loading branch information
@oscargus
oscargus committed Oct 15, 2022
commit 1e278c7e3296bce4fffb85ecf156a388d9a3268e
30 changes: 20 additions & 10 deletions lib/matplotlib/backends/_backend_tk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ def filter_destroy(event):

self._tkcanvas.focus_set()

self._rubberband_rect = None
self._rubberband_rect_black = None
self._rubberband_rect_white = None

def _update_device_pixel_ratio(self, event=None):
# Tk gives scaling with respect to 72 DPI, but Windows screens are
Expand Down Expand Up @@ -667,21 +668,30 @@ def set_message(self, s):

def draw_rubberband(self, event, x0, y0, x1, y1):
# Block copied from remove_rubberband for backend_tools convenience.
if self.canvas._rubberband_rect:
self.canvas._tkcanvas.delete(self.canvas._rubberband_rect)
if self.canvas._rubberband_rect_white:
self.canvas._tkcanvas.delete(self.canvas._rubberband_rect_white)
if self.canvas._rubberband_rect_black:
self.canvas._tkcanvas.delete(self.canvas._rubberband_rect_black)
height = self.canvas.figure.bbox.height
y0 = height - y0
y1 = height - y1
self.canvas._rubberband_rect = self.canvas._tkcanvas.create_rectangle(
x0, y0, x1, y1)
self.canvas._rubberband_rect_black = (
self.canvas._tkcanvas.create_rectangle(
x0, y0, x1, y1))
self.canvas._rubberband_rect_white = (
self.canvas._tkcanvas.create_rectangle(
x0, y0, x1, y1, outline='white', dash=(3, 3)))

def remove_rubberband(self):
if self.canvas._rubberband_rect:
self.canvas._tkcanvas.delete(self.canvas._rubberband_rect)
self.canvas._rubberband_rect = None
if self.canvas._rubberband_rect_white:
self.canvas._tkcanvas.delete(self.canvas._rubberband_rect_white)
self.canvas._rubberband_rect_white = None
if self.canvas._rubberband_rect_black:
self.canvas._tkcanvas.delete(self.canvas._rubberband_rect_black)
self.canvas._rubberband_rect_black = None

lastrect = _api.deprecated("3.6")(
property(lambda self: self.canvas._rubberband_rect))
property(lambda self: self.canvas._rubberband_rect_black))

def _set_image_for_button(self, button):
"""
Expand Down Expand Up @@ -907,7 +917,7 @@ def remove_rubberband(self):
self._make_classic_style_pseudo_toolbar())

lastrect = _api.deprecated("3.6")(
property(lambda self: self.figure.canvas._rubberband_rect))
property(lambda self: self.figure.canvas._rubberband_rect_black))


@_api.deprecated("3.5", alternative="ToolSetCursor")
Expand Down