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 keyboard input focus in Graph Editor #1596

Merged
merged 12 commits into from
Jun 30, 2024
Merged

Fix keyboard input focus in Graph Editor #1596

merged 12 commits into from
Jun 30, 2024

Conversation

HudsonHN
Copy link
Contributor

@HudsonHN HudsonHN commented Nov 7, 2023

Changed IsWindowFocused flags for inputs mentioned in #1424 to prevent all panels from responding.

HudsonHN and others added 8 commits October 19, 2023 03:25
@HudsonHN
Fix: Scroll wheel zooms and scrolls property editor
7a05857 
Fixed the issue where using the scroll wheel will both zoom in the renderview as well as the panel bar.
This is done by doing a cursor bounds check and disabling scrolling for the panel if the cursor is inside the renderview.
@HudsonHN
Merge branch 'main' of https://github.com/HudsonHN/MaterialX
a15af3e
@jstone-lucasfilm
Merge branch 'main' into main
fe0bdc2 
Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>
@jstone-lucasfilm
Merge branch 'main' into main
31c146f
@HudsonHN
Merge branch 'AcademySoftwareFoundation:main' into main
b7f4b40
@HudsonHN
Fix keyboard input affecting panels regardless of focus
8ea4e3a 
Changed IsWindowFocused flags for inputs mentioned in AcademySoftwareFoundation#1424 to prevent all panels from responding.
@HudsonHN
Merge branch 'main' of https://github.com/HudsonHN/MaterialX
a697f1b
@HudsonHN
Merge branch 'AcademySoftwareFoundation:main' into main
5845c27
@eytienne eytienne mentioned this pull request Nov 17, 2023
Closed
eytienne
eytienne suggested changes Nov 17, 2023
View reviewed changes
source/MaterialXGraphEditor/Graph.cpp Outdated Show resolved Hide resolved
@jstone-lucasfilm
Copy link
Member

@HudsonHN It would be great if we can include this improvement in MaterialX 1.39, which is scheduled for release this summer. Would you mind retargeting your pull request to the dev_1.39 branch, so that we can consider your change in that context?

@HudsonHN HudsonHN changed the base branch from main to dev_1.39 March 15, 2024 03:59
@jstone-lucasfilm jstone-lucasfilm changed the base branch from dev_1.39 to main May 31, 2024 22:20
@jstone-lucasfilm jstone-lucasfilm changed the base branch from main to dev_1.39 May 31, 2024 22:23
@jstone-lucasfilm jstone-lucasfilm changed the base branch from dev_1.39 to main June 25, 2024 03:34
@jstone-lucasfilm jstone-lucasfilm changed the base branch from main to dev_1.39 June 25, 2024 03:37
@jstone-lucasfilm
Copy link
Member

@HudsonHN We've now merged development work on MaterialX 1.39 back to the main branch of MaterialX, in preparation for wrapping up development on the 1.39.0 release. When you have a chance, could you retarget this pull request back to the main branch as well?

@HudsonHN HudsonHN changed the base branch from dev_1.39 to main June 25, 2024 07:31
@HudsonHN HudsonHN closed this Jun 25, 2024
@HudsonHN HudsonHN reopened this Jun 25, 2024
@HudsonHN
Copy link
Contributor Author

@HudsonHN We've now merged development work on MaterialX 1.39 back to the main branch of MaterialX, in preparation for wrapping up development on the 1.39.0 release. When you have a chance, could you retarget this pull request back to the main branch as well?

Fumbled a bit but it's done 😄

jstone-lucasfilm
jstone-lucasfilm approved these changes Jun 30, 2024
View reviewed changes
Copy link
Member

@jstone-lucasfilm jstone-lucasfilm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, thanks @HudsonHN!

@jstone-lucasfilm jstone-lucasfilm changed the title Fix keyboard input affecting panels regardless of focus Fix keyboard input focus in Graph Editor Jun 30, 2024
@jstone-lucasfilm jstone-lucasfilm merged commit ad0615b into AcademySoftwareFoundation:main Jun 30, 2024
34 checks passed
@jstone-lucasfilm jstone-lucasfilm mentioned this pull request Jun 30, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eytienne eytienne eytienne requested changes

@jstone-lucasfilm jstone-lucasfilm jstone-lucasfilm 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.
3 participants
@HudsonHN @jstone-lucasfilm @eytienne