Skip to content

MAINT: fix type error of comparing int and KeyboardModifier #1045

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
corranwebster merged 4 commits into from
May 9, 2023
Merged

MAINT: fix type error of comparing int and KeyboardModifier #1045

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2b29ef
MAINT: fix type error of comparing int and KeyboardModifier
Apr 28, 2023
0ba334c
MAINT: add detail explanation of the AttributeError happening
May 1, 2023
5795349
Merge branch 'main' into fix_keyboardmodifier_type_error
homosapien-lcy May 8, 2023
e0de44e
MAINT: 1 add mousebutton to the qt button calls 2 remove comments abo…
May 8, 2023
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
25 changes: 14 additions & 11 deletions enable/qt/base_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,9 @@ def _create_key_event(self, event_type, event):
character=key,
x=x,
y=self._flip_y(y),
alt_down=bool(modifiers & QtCore.Qt.AltModifier),
shift_down=bool(modifiers & QtCore.Qt.ShiftModifier),
control_down=bool(modifiers & QtCore.Qt.ControlModifier),
alt_down=bool(modifiers & QtCore.Qt.KeyboardModifier.AltModifier),
shift_down=bool(modifiers & QtCore.Qt.KeyboardModifier.ShiftModifier),
control_down=bool(modifiers & QtCore.Qt.KeyboardModifier.ControlModifier),
event=event,
window=self,
)
Expand All @@ -461,12 +461,15 @@ def _create_mouse_event(self, event):
y = event.position().y()
modifiers = event.modifiers()
buttons = event.buttons()
# The AttributeError is usually trigged when the mouse pointer
# leaves the ui window since the event of leaving the window
# is a "QEvent", which doesn't contain x and y positions.
except AttributeError:
pos = self.control.mapFromGlobal(QtGui.QCursor.pos())
x = pos.x()
y = pos.y()
modifiers = 0
buttons = 0
modifiers = QtCore.Qt.KeyboardModifier.NoModifier
buttons = QtCore.Qt.MouseButton.NoButton

self.control.handler.last_mouse_pos = (x, y)

Expand Down Expand Up @@ -499,12 +502,12 @@ def _create_mouse_event(self, event):
mouse_wheel=mouse_wheel,
mouse_wheel_axis=mouse_wheel_axis,
mouse_wheel_delta=mouse_wheel_delta,
alt_down=bool(modifiers & QtCore.Qt.AltModifier),
shift_down=bool(modifiers & QtCore.Qt.ShiftModifier),
control_down=bool(modifiers & QtCore.Qt.ControlModifier),
left_down=bool(buttons & QtCore.Qt.LeftButton),
middle_down=bool(buttons & QtCore.Qt.MiddleButton),
right_down=bool(buttons & QtCore.Qt.RightButton),
alt_down=bool(modifiers & QtCore.Qt.KeyboardModifier.AltModifier),
shift_down=bool(modifiers & QtCore.Qt.KeyboardModifier.ShiftModifier),
control_down=bool(modifiers & QtCore.Qt.KeyboardModifier.ControlModifier),
left_down=bool(buttons & QtCore.Qt.MouseButton.LeftButton),
middle_down=bool(buttons & QtCore.Qt.MouseButton.MiddleButton),
right_down=bool(buttons & QtCore.Qt.MouseButton.RightButton),
window=self,
)

Expand Down