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.

Sign up for GitHub

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

Fix getPixelScaleFactor #198

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Fix getPixelScaleFactor #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/lwjgl/input/Mouse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ public static void addMoveEvent(double mouseX, double mouseY) {
ignoreNextMove--;
return;
}
/*float scale = Display.getPixelScaleFactor();
float scale = Display.getPixelScaleFactor();
mouseX *= scale;
mouseY *= scale;*/
mouseY *= scale;
dx += (int) mouseX - latestX;
dy += Display.getHeight() - (int) mouseY - latestY;
latestX = (int) mouseX;
Expand Down
18 changes: 14 additions & 4 deletions src/main/java/org/lwjgl/opengl/Display.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,20 @@ public static float getPixelScaleFactor() {
if (!isCreated()) {
return 1.0f;
}
float[] xScale = new float[1];
float[] yScale = new float[1];
glfwGetWindowContentScale(getWindow(), xScale, yScale);
return Math.max(xScale[0], yScale[0]);
int[] windowWidth = new int[1];
int[] windowHeight = new int[1];
int[] framebufferWidth = new int[1];
int[] framebufferHeight = new int[1];
float xScale, yScale;
// via technicality we actually have to divide the framebuffer
// size by the window size here, since glfwGetWindowContentScale
// returns a value not equal to 1 even on platforms where the
// framebuffer size and window size always map 1:1
glfwGetWindowSize(getWindow(), windowWidth, windowHeight);
glfwGetFramebufferSize(getWindow(), framebufferWidth, framebufferHeight);
xScale = (float)framebufferWidth[0]/windowWidth[0];
yScale = (float)framebufferHeight[0]/windowHeight[0];
return Math.max(xScale, yScale);
}

public static void setTitle(String title) {
Expand Down