Skip to content

Remove tk button swap logic on macOS #32187

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

Open
iccir wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −12
Open

Remove tk button swap logic on macOS #32187

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
12 changes: 0 additions & 12 deletions lib/matplotlib/backends/_backend_tk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,6 @@ def button_press_event(self, event, dblclick=False):
self._tkcanvas.focus_set()

num = getattr(event, 'num', None)
if sys.platform == 'darwin': # 2 and 3 are reversed.
num = {2: 3, 3: 2}.get(num, num)
MouseEvent("button_press_event", self,
*self._event_mpl_coords(event), num, dblclick=dblclick,
modifiers=self._mpl_modifiers(event),
Expand All @@ -368,8 +366,6 @@ def button_dblclick_event(self, event):

def button_release_event(self, event):
num = getattr(event, 'num', None)
if sys.platform == 'darwin': # 2 and 3 are reversed.
num = {2: 3, 3: 2}.get(num, num)
MouseEvent("button_release_event", self,
*self._event_mpl_coords(event), num,
modifiers=self._mpl_modifiers(event),
Expand Down Expand Up @@ -402,14 +398,6 @@ def _mpl_buttons(event): # See _mpl_modifiers.
# NOTE: This fails to report multiclicks on macOS; only one button is
# reported (multiclicks work correctly on Linux & Windows).
modifiers = [
# macOS appears to swap right and middle (look for "Swap buttons
# 2/3" in tk/macosx/tkMacOSXMouseEvent.c).
(MouseButton.LEFT, 1 << 8),
(MouseButton.RIGHT, 1 << 9),
(MouseButton.MIDDLE, 1 << 10),
(MouseButton.BACK, 1 << 11),
(MouseButton.FORWARD, 1 << 12),
] if sys.platform == "darwin" else [
(MouseButton.LEFT, 1 << 8),
(MouseButton.MIDDLE, 1 << 9),
(MouseButton.RIGHT, 1 << 10),
Expand Down
Loading