Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
glfw
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pirvi-public
glfw
Commits
8cd88ddf
Commit
8cd88ddf
authored
10 years ago
by
Camilla Löwy
Browse files
Options
Downloads
Patches
Plain Diff
Cleanup of OS X cursor fixes.
Closes #334. Fixes #254.
parent
87fb437d
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
README.md
+1
-0
1 addition, 0 deletions
README.md
src/cocoa_window.m
+4
-7
4 additions, 7 deletions
src/cocoa_window.m
with
5 additions
and
7 deletions
README.md
+
1
−
0
View file @
8cd88ddf
...
...
@@ -82,6 +82,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
-
[Cocoa] Bugfix: Modifier key events were lost if the corresponding modifier
bit field was unchanged
-
[Cocoa] Bugfix: Joystick enumeration took hundreds of ms on some systems
-
[Cocoa] Bugfix: The cursor was hidden when the user resized a GLFW window
-
[Win32] Enabled generation of pkg-config file for MinGW
-
[Win32] Bugfix: Failure to load winmm or its functions was not reported to
the error callback
...
...
This diff is collapsed.
Click to expand it.
src/cocoa_window.m
+
4
−
7
View file @
8cd88ddf
...
...
@@ -58,11 +58,10 @@ static NSCursor* getModeCursor(_GLFWwindow* window)
//
static
void
updateModeCursor
(
_GLFWwindow
*
window
)
{
// This is required for the cursor to update if cursor is inside the window
NSCursor
*
cursor
=
getModeCursor
(
window
);
[
cursor
set
];
// This is required for the cursor to update if it's inside the window
[
getModeCursor
(
window
)
set
];
// This is required for the cursor to update if
cursor i
s outside the window
// This is required for the cursor to update if
it'
s outside the window
[
window
->
ns
.
object
invalidateCursorRectsForView
:
window
->
ns
.
view
];
}
...
...
@@ -687,9 +686,7 @@ static int translateKey(unsigned int key)
-
(
void
)
resetCursorRects
{
NSCursor
*
cursor
=
getModeCursor
(
window
);
[
self
addCursorRect
:[
self
bounds
]
cursor
:
cursor
];
[
self
addCursorRect
:[
self
bounds
]
cursor
:
getModeCursor
(
window
)];
}
-
(
NSDragOperation
)
draggingEntered
:(
id
<
NSDraggingInfo
>
)
sender
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment