Improve mouse cursor handling. #965
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
Added all the standard shapes supported by GLFW. Fixed memory leak where GLFW cursors weren't being destroyed. Fixed bug where MouseCursor on window defaulted to null, not Default.
varon
reviewed
Oct 2, 2019
Comment on lines
+1550
to
+1569
| private static CursorShape MapStandardCursorShape(MouseCursor.StandardShape shape) | ||
| { | ||
| switch (shape) | ||
| { | ||
| case MouseCursor.StandardShape.Arrow: | ||
| return CursorShape.Arrow; | ||
| case MouseCursor.StandardShape.IBeam: | ||
| return CursorShape.IBeam; | ||
| case MouseCursor.StandardShape.Crosshair: | ||
| return CursorShape.Crosshair; | ||
| case MouseCursor.StandardShape.Hand: | ||
| return CursorShape.Hand; | ||
| case MouseCursor.StandardShape.HResize: | ||
| return CursorShape.HResize; | ||
| case MouseCursor.StandardShape.VResize: | ||
| return CursorShape.VResize; | ||
| default: | ||
| throw new ArgumentOutOfRangeException(nameof(shape), shape, null); | ||
| } | ||
| } |
There was a problem hiding this comment.
Do we need to do this mapping and/or have two separate types?
There was a problem hiding this comment.
The alternative would be a massive if else chain of cursor == MouseCursor.IBeam, so I'm not sure that's preferable.
| @@ -154,7 +154,7 @@ | |||
| <!-- Documentation rules --> | |||
| <Rule Id="SA1600" Action="Error" /> <!-- Elements must be documented --> | |||
| <Rule Id="SA1601" Action="None" Intentional="true" /> <!-- Partial elements must be documented --> | |||
| <Rule Id="SA1602" Action="Error" /> <!-- Enumeration items must be documented --> | |||
| <Rule Id="SA1602" Action="None" /> <!-- Enumeration items must be documented --> | |||
varon
approved these changes
Oct 2, 2019
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.
Added all the standard shapes supported by GLFW.
Fixed memory leak where GLFW cursors weren't being destroyed.
Fixed bug where MouseCursor on window defaulted to null, not Default.