From ca9add800ac89b2a2fa872ef84220c71dccd1583 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Thu, 31 Aug 2017 23:41:58 -0400 Subject: [PATCH] Remove negative mouse dimension fix on Mac, doesn't work. Updated osdialog --- ext/osdialog | 2 +- src/gui.cpp | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ext/osdialog b/ext/osdialog index 063ed870..d2141b5b 160000 --- a/ext/osdialog +++ b/ext/osdialog @@ -1 +1 @@ -Subproject commit 063ed8701e08bf1cb0619a9f08cb370df28becc6 +Subproject commit d2141b5b8976e8adc2e3fda60fc012cf01e40c31 diff --git a/src/gui.cpp b/src/gui.cpp index 33b61b15..5c2020c3 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -73,13 +73,7 @@ void mouseButtonCallback(GLFWwindow *window, int button, int action, int mods) { } } -static bool mouseLockedLast = false; - void cursorPosCallback(GLFWwindow* window, double xpos, double ypos) { - // GLFW on Mac sends the mouse into negative coordinates when the mouse is locked/unlocked for some reason. - if (xpos < 0.0 || ypos < 0.0) - return; - Vec mousePos = Vec(xpos, ypos).round(); Vec mouseRel = mousePos.minus(gMousePos); gMousePos = mousePos;