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.

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

[2.1] Fix Input::set_custom_mouse_cursor showing cursor when it's invisible #22187

Merged
merged 1 commit into from Sep 17, 2018

Conversation

Projects
None yet
2 participants
@guilhermefelipecgs
Copy link
Member

commented Sep 17, 2018

Fix #20177.

@guilhermefelipecgs guilhermefelipecgs changed the title Fix Input::set_custom_mouse_cursor showing cursor when it's invisible [2.1] Fix Input::set_custom_mouse_cursor showing cursor when it's invisible Sep 17, 2018

@guilhermefelipecgs guilhermefelipecgs force-pushed the guilhermefelipecgs:fix_20177 branch from c9bc63f to c4e22f8 Sep 17, 2018

@akien-mga akien-mga added this to the 2.1 milestone Sep 17, 2018

@guilhermefelipecgs guilhermefelipecgs force-pushed the guilhermefelipecgs:fix_20177 branch from c4e22f8 to 72d4fd8 Sep 17, 2018

@@ -1166,7 +1166,7 @@ static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplay
if (cursor_shape == p_shape)
return;

if (mouse_mode != MOUSE_MODE_VISIBLE) {
if (mouse_mode != MOUSE_MODE_VISIBLE && mouse_mode != MOUSE_MODE_CONFINED) {

This comment has been minimized.

Copy link
@guilhermefelipecgs

guilhermefelipecgs Sep 17, 2018

Author Member

Ops, MOUSE_MODE_CONFINED doesn't exists in 2.1.

@akien-mga akien-mga merged commit d25c338 into godotengine:2.1 Sep 17, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@akien-mga

This comment has been minimized.

Copy link
Member

commented Sep 17, 2018

Thanks!

@guilhermefelipecgs guilhermefelipecgs deleted the guilhermefelipecgs:fix_20177 branch Sep 17, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.