MouseScrollUp/MouseScrollDown => plain MousEvent's #1458
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nitzan-shaked
force-pushed
the
mouse-events
branch
from
07a7e9a
to
e834b7a
Compare
willmcgugan
requested changes
Jan 2, 2023
src/textual/_xterm_parser.py
Outdated
| screen_x=x, | ||
| screen_y=y, | ||
| ) | ||
| event_cls = ( |
There was a problem hiding this comment.
There are too many nested ternary operators here, which makes the logic hard to follow. Suggest refactoring it in to simpler conditions and statements.
src/textual/_xterm_parser.py
Outdated
| if buttons & 32 | ||
| else (events.MouseDown if state == "M" else events.MouseUp) | ||
| ) | ||
| if event_cls in (events.MouseScrollUp, events.MouseScrollDown): |
There was a problem hiding this comment.
This condition is checking something that we only just assigned in the previous statement. Suggest if we need to do something different, we should to it in the branch where event_cls is assigned.
src/textual/_xterm_parser.py
Outdated
| else (events.MouseDown if state == "M" else events.MouseUp) | ||
| ) | ||
| if event_cls in (events.MouseScrollUp, events.MouseScrollDown): | ||
| buttons &= ~(64 | 3) |
There was a problem hiding this comment.
We shouldn't need to modify buttons after it is assigned.
... which means they get passesd x, y, etc. In particular, they are passed the keyboard modifiers. This allows widgets to use e.g. ctrl-wheel to scroll right/left.
nitzan-shaked
force-pushed
the
mouse-events
branch
from
e834b7a
to
0b249bd
Compare
|
@willmcgugan I changed the code to fix all 3 of your comments above. I admit I like it less that way, but if you like it better then I'm happy. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
... which means they get passesd x, y, etc. In particular, they are passed the keyboard modifiers. This allows widgets to use e.g. ctrl-wheel to scroll right/left.