Skip to content
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

Jump to bottom

Fix mac scroll modifier #402

Merged
merged 10 commits into from
May 20, 2021
Merged

Fix mac scroll modifier #402

merged 10 commits into from
May 20, 2021

Conversation

quadruple-output
Copy link
Contributor

Closes #401.

follower
follower reviewed May 16, 2021
View reviewed changes
egui_glium/src/lib.rs Outdated Show resolved Hide resolved
@quadruple-output
Copy link
Contributor Author

I uploaded a pre-compiled version for the web backend at https://quadruple-output.github.io/egui/, so you may compare the behavior with the main branch at https://emilk.github.io/egui/. There should not be any noticeable difference on Windows, Linux, or on a tablet. But on Mac, the Command key can now be used for zooming with the mouse wheel (or two-finger touch gesture).

emilk
emilk reviewed May 17, 2021
View reviewed changes
egui_glium/src/lib.rs Outdated Show resolved Hide resolved
@quadruple-output @emilk
accept emilk's proposed change
0ac0948 
Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
@quadruple-output
Copy link
Contributor Author

Hi emilk, I just accepted your proposed change, but don't close the PR, yet! I would like to adapt the UI demo instructions to reflect that, on Mac, both CMD and CTRL can be used. However, I would like to know whether you consider the verbose UI texts I proposed to be "too much"? (In particular, I am not sure about the behavior an some Windows touch screens which I cannot test. Therefore, the text is both verbose and vage for native non-mac builds.)

emilk
emilk reviewed May 18, 2021
View reviewed changes
egui_demo_lib/src/apps/demo/plot_demo.rs Outdated Show resolved Hide resolved
egui_demo_lib/src/apps/demo/plot_demo.rs Outdated Show resolved Hide resolved
@emilk emilk merged commit 67c6002 into emilk:master May 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@follower follower follower left review comments

@emilk emilk emilk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Zooming with ctrl + MouseWheel does not work as expected on a Mac
3 participants
@quadruple-output @follower @emilk