backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-19 22:57:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: compute logical mouse position using window scale factor

Browse source 
Fixes mouse support in menus on systems with scaling factors other than 1.0x
This commit is contained in:
Tropical 2026-03-09 23:07:42 -05:00
parent 0a286d4ddc
commit f0aa04a7ee
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Minecraft.Client/UI/Screen.cpp
View file

@ -54,7 +54,7 @@ void Screen::mouseClicked(int x, int y, int buttonNum)
{ {
if (buttonNum == 0) if (buttonNum == 0)
{ {
AUTO_VAR(itEnd, buttons.end()); AUTO_VAR(itEnd, buttons.end());
for (AUTO_VAR(it, buttons.begin()); it != itEnd; it++) for (AUTO_VAR(it, buttons.begin()); it != itEnd; it++)
{ {
Button *button = *it; //buttons[i]; Button *button = *it; //buttons[i];
@ -116,11 +116,15 @@ void Screen::updateEvents()
GLFWwindow* window = glfwGetCurrentContext(); GLFWwindow* window = glfwGetCurrentContext();
if (!window) return; if (!window) return;
float windowScaleX = 1;
float windowScaleY = 1;
glfwGetWindowContentScale(window, &windowScaleX, &windowScaleY);
double xpos, ypos; double xpos, ypos;
glfwGetCursorPos(window, &xpos, &ypos); glfwGetCursorPos(window, &xpos, &ypos);
int xMouse = (int)xpos * screenWidth / fbw; int xMouse = (int)(xpos * windowScaleX) * screenWidth / fbw;
int yMouse = (int)ypos * screenHeight / fbh - 1; int yMouse = (int)(ypos * windowScaleY) * screenHeight / fbh - 1;
static bool prevLeftState = false; static bool prevLeftState = false;
static bool prevRightState = false; static bool prevRightState = false;