Skip to content

Fix occasional misalignment in reported mouse position #32038

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

Draft
ayshih wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix occasional misalignment in reported mouse position #32038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/_backend_gtk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def set_message(self, s):
self.message.set_markup(f'<small>{escaped}</small>')

def draw_rubberband(self, event, x0, y0, x1, y1):
height = self.canvas.figure.bbox.height
height = int(self.canvas.figure.bbox.height + 0.5)
y1 = height - y1
y0 = height - y0
rect = [int(val) for val in (x0, y0, x1 - x0, y1 - y0)]
Expand Down
8 changes: 4 additions & 4 deletions lib/matplotlib/backends/_backend_tk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def _event_mpl_coords(self, event):
# the top of the widget may have been scrolled out of view).
return (self._tkcanvas.canvasx(event.x),
# flipy so y=0 is bottom of canvas
self.figure.bbox.height - self._tkcanvas.canvasy(event.y))
int(self.figure.bbox.height + 0.5) - self._tkcanvas.canvasy(event.y))

def motion_notify_event(self, event):
MouseEvent("motion_notify_event", self,
Expand Down Expand Up @@ -389,7 +389,7 @@ def scroll_event_windows(self, event):
if w != self._tkcanvas:
return
x = self._tkcanvas.canvasx(event.x_root - w.winfo_rootx())
y = (self.figure.bbox.height
y = (int(self.figure.bbox.height + 0.5)
- self._tkcanvas.canvasy(event.y_root - w.winfo_rooty()))
step = event.delta / 120
MouseEvent("scroll_event", self,
Expand Down Expand Up @@ -676,7 +676,7 @@ def __init__(self, canvas, window=None, *, pack_toolbar=True):
if window is None:
window = canvas.get_tk_widget().master
tk.Frame.__init__(self, master=window, borderwidth=2,
width=int(canvas.figure.bbox.width), height=50)
width=int(canvas.figure.bbox.width + 0.5), height=50)
# Avoid message_label expanding the toolbar size, and in turn expanding the
# canvas size.
# Without pack_propagate(False), when the user defines a small figure size
Expand Down Expand Up @@ -774,7 +774,7 @@ def draw_rubberband(self, event, x0, y0, x1, y1):
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
height = int(self.canvas.figure.bbox.height + 0.5)
y0 = height - y0
y1 = height - y1
self.canvas._rubberband_rect_black = (
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/backend_gtk3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def _mpl_coords(self, event=None):
x, y = event.x, event.y
x = x * self.device_pixel_ratio
# flip y so y=0 is bottom of canvas
y = self.figure.bbox.height - y * self.device_pixel_ratio
y = int(self.figure.bbox.height + 0.5) - y * self.device_pixel_ratio
return x, y

def scroll_event(self, widget, event):
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/backend_gtk4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def _mpl_coords(self, xy=None):
x, y = xy
x = x * self.device_pixel_ratio
# flip y so y=0 is bottom of canvas
y = self.figure.bbox.height - y * self.device_pixel_ratio
y = int(self.figure.bbox.height + 0.5) - y * self.device_pixel_ratio
return x, y

def scroll_event(self, controller, dx, dy):
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/backends/backend_qt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def mouseEventCoords(self, pos=None):
# (otherwise, it's already a QPoint)
x = pos.x()
# flip y so y=0 is bottom of canvas
y = self.figure.bbox.height / self.device_pixel_ratio - pos.y()
y = int(self.figure.bbox.height + 0.5) / self.device_pixel_ratio - pos.y()
return x * self.device_pixel_ratio, y * self.device_pixel_ratio

def enterEvent(self, event):
Expand Down Expand Up @@ -918,7 +918,7 @@ def set_message(self, s):
self.locLabel.setText(s)

def draw_rubberband(self, event, x0, y0, x1, y1):
height = self.canvas.figure.bbox.height
height = int(self.canvas.figure.bbox.height + 0.5)
y1 = height - y1
y0 = height - y0
rect = [int(val) for val in (x0, y0, x1 - x0, y1 - y0)]
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/backends/backend_tkcairo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

class FigureCanvasTkCairo(FigureCanvasCairo, FigureCanvasTk):
def draw(self):
width = int(self.figure.bbox.width)
height = int(self.figure.bbox.height)
width = int(self.figure.bbox.width + 0.5)
height = int(self.figure.bbox.height + 0.5)
surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
self._renderer.set_context(cairo.Context(surface))
self._renderer.dpi = self.figure.dpi
Expand Down
6 changes: 3 additions & 3 deletions lib/matplotlib/backends/backend_wx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,9 +746,9 @@ def _mpl_coords(self, pos=None):
# flip y so y=0 is bottom of canvas
if not wx.Platform == '__WXMSW__':
scale = self.GetDPIScaleFactor()
return x*scale, self.figure.bbox.height - y*scale
return x*scale, int(self.figure.bbox.height + 0.5) - y*scale
else:
return x, self.figure.bbox.height - y
return x, int(self.figure.bbox.height + 0.5) - y

def _on_key_down(self, event):
"""Capture key press."""
Expand Down Expand Up @@ -1169,7 +1169,7 @@ def save_figure(self, *args):
dialog.Destroy()

def draw_rubberband(self, event, x0, y0, x1, y1):
height = self.canvas.figure.bbox.height
height = int(self.canvas.figure.bbox.height + 0.5)
sf = 1 if wx.Platform == '__WXMSW__' else self.canvas.GetDPIScaleFactor()
self.canvas._rubberband_rect = (x0/sf, (height - y0)/sf,
x1/sf, (height - y1)/sf)
Expand Down
Loading