Skip to content

Scale width of Caret w.r.t. the native zoom #2471

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −4
Open

Scale width of Caret w.r.t. the native zoom #2471

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
21 changes: 17 additions & 4 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ Rectangle getBoundsInPixels () {
if (width == 0) {
int [] buffer = new int [1];
if (OS.SystemParametersInfo (OS.SPI_GETCARETWIDTH, 0, buffer, 0)) {
return new Rectangle (getXInPixels(), getYInPixels(), buffer [0], getHeightInPixels());
int width = DPIUtil.pixelToPoint(buffer [0], getPrimaryMonitorZoomAtStartup());
int widthInPixels = Win32DPIUtils.pointToPixel(width, getNativeZoom());
return new Rectangle (getXInPixels(), getYInPixels(), widthInPixels, getHeightInPixels());
}
}
return new Rectangle (getXInPixels(), getYInPixels(), getWidthInPixels(), getHeightInPixels());
Expand Down Expand Up @@ -226,7 +228,9 @@ Point getSizeInPixels () {
if (width == 0) {
int [] buffer = new int [1];
if (OS.SystemParametersInfo (OS.SPI_GETCARETWIDTH, 0, buffer, 0)) {
return new Point (buffer [0], getHeightInPixels());
int width = DPIUtil.pixelToPoint(buffer [0], getPrimaryMonitorZoomAtStartup());
int widthInPixels = Win32DPIUtils.pointToPixel(width, getNativeZoom());
return new Point (widthInPixels, getHeightInPixels());
}
}
return new Point (getWidthInPixels(), getHeightInPixels());
Expand Down Expand Up @@ -370,7 +374,8 @@ void resize () {
if (image == null && widthInPixels == 0) {
int [] buffer = new int [1];
if (OS.SystemParametersInfo (OS.SPI_GETCARETWIDTH, 0, buffer, 0)) {
widthInPixels = buffer [0];
int width = DPIUtil.pixelToPoint(buffer [0], getPrimaryMonitorZoomAtStartup());
widthInPixels = Win32DPIUtils.pointToPixel(width, getNativeZoom());
}
}
OS.CreateCaret (hwnd, hBitmap, widthInPixels, getHeightInPixels());
Expand Down Expand Up @@ -449,7 +454,8 @@ void setFocus () {
if (image == null && widthInPixels == 0) {
int [] buffer = new int [1];
if (OS.SystemParametersInfo (OS.SPI_GETCARETWIDTH, 0, buffer, 0)) {
widthInPixels = buffer [0];
int width = DPIUtil.pixelToPoint(buffer [0], getPrimaryMonitorZoomAtStartup());
widthInPixels = Win32DPIUtils.pointToPixel(width, getNativeZoom());
}
}
OS.CreateCaret (hwnd, hBitmap, widthInPixels, getHeightInPixels());
Expand Down Expand Up @@ -646,6 +652,13 @@ public void setVisible (boolean visible) {
}
}

private int getPrimaryMonitorZoomAtStartup() {
long hDC = OS.GetDC(0);
int dpi = OS.GetDeviceCaps(hDC, OS.LOGPIXELSX);
OS.ReleaseDC(0, hDC);
return DPIUtil.mapDPIToZoom(dpi);
}

/**
* <b>IMPORTANT:</b> This method is not part of the public
* API for Image. It is marked public only so that it
Expand Down
Loading