Skip to content

[win32] Scale up bounds as rectangle in GC #1762

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

Merged
merged 1 commit into from
Mar 5, 2025
Merged

[win32] Scale up bounds as rectangle in GC #1762

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
107 changes: 29 additions & 78 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,14 +533,10 @@ public void copyArea (int srcX, int srcY, int width, int height, int destX, int
* @since 3.1
*/
public void copyArea (int srcX, int srcY, int width, int height, int destX, int destY, boolean paint) {
int deviceZoom = getZoom();
srcX = DPIUtil.scaleUp(drawable, srcX, deviceZoom);
srcY = DPIUtil.scaleUp(drawable, srcY, deviceZoom);
width = DPIUtil.scaleUp(drawable, width, deviceZoom);
height = DPIUtil.scaleUp(drawable, height, deviceZoom);
destX = DPIUtil.scaleUp(drawable, destX, deviceZoom);
destY = DPIUtil.scaleUp(drawable, destY, deviceZoom);
copyAreaInPixels(srcX, srcY, width, height, destX, destY, paint);
int zoom = getZoom();
Rectangle sourceRect = DPIUtil.scaleUp(drawable, new Rectangle(srcX, srcY, width, height), zoom);
Rectangle destRect = DPIUtil.scaleUp(drawable, new Rectangle(destX, destY, width, height), zoom);
copyAreaInPixels(sourceRect.x, sourceRect.y, sourceRect.width, sourceRect.height, destRect.x, destRect.y, paint);
}

void copyAreaInPixels(int srcX, int srcY, int width, int height, int destX, int destY, boolean paint) {
Expand Down Expand Up @@ -780,12 +776,8 @@ void disposeGdip() {
* </ul>
*/
public void drawArc (int x, int y, int width, int height, int startAngle, int arcAngle) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp(drawable, x, deviceZoom);
y = DPIUtil.scaleUp(drawable, y, deviceZoom);
width = DPIUtil.scaleUp(drawable, width, deviceZoom);
height = DPIUtil.scaleUp(drawable, height, deviceZoom);
drawArcInPixels(x, y, width, height, startAngle, arcAngle);
Rectangle rect = DPIUtil.scaleUp(drawable, new Rectangle(x, y, width, height), getZoom());
drawArcInPixels(rect.x, rect.y, rect.width, rect.height, startAngle, arcAngle);
}

void drawArcInPixels (int x, int y, int width, int height, int startAngle, int arcAngle) {
Expand Down Expand Up @@ -864,12 +856,8 @@ void drawArcInPixels (int x, int y, int width, int height, int startAngle, int a
* @see #drawRectangle(int, int, int, int)
*/
public void drawFocus (int x, int y, int width, int height) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
drawFocusInPixels(x, y, width, height);
Rectangle rect = DPIUtil.scaleUp(drawable, new Rectangle(x, y, width, height), getZoom());
drawFocusInPixels(rect.x, rect.y, rect.width, rect.height);
}

void drawFocusInPixels (int x, int y, int width, int height) {
Expand Down Expand Up @@ -1717,12 +1705,8 @@ void drawLineInPixels (int x1, int y1, int x2, int y2) {
* </ul>
*/
public void drawOval (int x, int y, int width, int height) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
drawOvalInPixels(x, y, width, height);
Rectangle rect = DPIUtil.scaleUp(drawable, new Rectangle(x, y, width, height), getZoom());
drawOvalInPixels(rect.x, rect.y, rect.width, rect.height);
}

void drawOvalInPixels (int x, int y, int width, int height) {
Expand Down Expand Up @@ -1931,12 +1915,7 @@ void drawPolylineInPixels(int[] pointArray) {
* </ul>
*/
public void drawRectangle (int x, int y, int width, int height) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
drawRectangleInPixels(x, y, width, height);
drawRectangle(new Rectangle(x, y, width, height));
}

void drawRectangleInPixels (int x, int y, int width, int height) {
Expand Down Expand Up @@ -2017,14 +1996,11 @@ public void drawRectangle (Rectangle rect) {
* </ul>
*/
public void drawRoundRectangle (int x, int y, int width, int height, int arcWidth, int arcHeight) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
arcWidth = DPIUtil.scaleUp (drawable, arcWidth, deviceZoom);
arcHeight = DPIUtil.scaleUp (drawable, arcHeight, deviceZoom);
drawRoundRectangleInPixels(x, y, width, height, arcWidth, arcHeight);
int zoom = getZoom();
Rectangle rect = DPIUtil.scaleUp(drawable, new Rectangle(x, y, width, height), zoom);
arcWidth = DPIUtil.scaleUp (drawable, arcWidth, zoom);
arcHeight = DPIUtil.scaleUp (drawable, arcHeight, zoom);
drawRoundRectangleInPixels(rect.x, rect.y, rect.width, rect.height, arcWidth, arcHeight);
}

void drawRoundRectangleInPixels (int x, int y, int width, int height, int arcWidth, int arcHeight) {
Expand Down Expand Up @@ -2708,12 +2684,8 @@ public boolean equals (Object object) {
* @see #drawArc
*/
public void fillArc (int x, int y, int width, int height, int startAngle, int arcAngle) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
fillArcInPixels(x, y, width, height, startAngle, arcAngle);
Rectangle rect = DPIUtil.scaleUp(drawable, new Rectangle(x, y, width, height), getZoom());
fillArcInPixels(rect.x, rect.y, rect.width, rect.height, startAngle, arcAngle);
}

void fillArcInPixels (int x, int y, int width, int height, int startAngle, int arcAngle) {
Expand Down Expand Up @@ -2788,12 +2760,8 @@ void fillArcInPixels (int x, int y, int width, int height, int startAngle, int a
* @see #drawRectangle(int, int, int, int)
*/
public void fillGradientRectangle (int x, int y, int width, int height, boolean vertical) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
fillGradientRectangleInPixels(x, y, width, height, vertical);
Rectangle rect = DPIUtil.scaleUp(drawable, new Rectangle(x, y, width, height), getZoom());
fillGradientRectangleInPixels(rect.x, rect.y, rect.width, rect.height, vertical);
}

void fillGradientRectangleInPixels(int x, int y, int width, int height, boolean vertical) {
Expand Down Expand Up @@ -2907,12 +2875,8 @@ void fillGradientRectangleInPixels(int x, int y, int width, int height, boolean
* @see #drawOval
*/
public void fillOval (int x, int y, int width, int height) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
fillOvalInPixels(x, y, width, height);
Rectangle rect = DPIUtil.scaleUp(drawable, new Rectangle(x, y, width, height), getZoom());
fillOvalInPixels(rect.x, rect.y, rect.width, rect.height);
}

void fillOvalInPixels (int x, int y, int width, int height) {
Expand Down Expand Up @@ -3031,12 +2995,7 @@ void fillPolygonInPixels (int[] pointArray) {
* @see #drawRectangle(int, int, int, int)
*/
public void fillRectangle (int x, int y, int width, int height) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
fillRectangleInPixels(x, y, width, height);
fillRectangle(new Rectangle(x, y, width, height));
}

void fillRectangleInPixels (int x, int y, int width, int height) {
Expand Down Expand Up @@ -3097,14 +3056,11 @@ public void fillRectangle (Rectangle rect) {
* @see #drawRoundRectangle
*/
public void fillRoundRectangle (int x, int y, int width, int height, int arcWidth, int arcHeight) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
arcWidth = DPIUtil.scaleUp (drawable, arcWidth, deviceZoom);
arcHeight = DPIUtil.scaleUp (drawable, arcHeight, deviceZoom);
fillRoundRectangleInPixels(x, y, width, height, arcWidth, arcHeight);
int zoom = getZoom();
Rectangle rect = DPIUtil.scaleUp(drawable, new Rectangle(x, y, width, height), zoom);
arcWidth = DPIUtil.scaleUp (drawable, arcWidth, zoom);
arcHeight = DPIUtil.scaleUp (drawable, arcHeight, zoom);
fillRoundRectangleInPixels(rect.x, rect.y, rect.width, rect.height, arcWidth, arcHeight);
}

void fillRoundRectangleInPixels (int x, int y, int width, int height, int arcWidth, int arcHeight) {
Expand Down Expand Up @@ -4302,12 +4258,7 @@ void setClipping(long clipRgn) {
* </ul>
*/
public void setClipping (int x, int y, int width, int height) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp(drawable, x, deviceZoom);
y = DPIUtil.scaleUp(drawable, y, deviceZoom);
width = DPIUtil.scaleUp(drawable, width, deviceZoom);
height = DPIUtil.scaleUp(drawable, height, deviceZoom);
setClippingInPixels(x, y, width, height);
setClipping(new Rectangle(x, y, width, height));
}

void setClippingInPixels (int x, int y, int width, int height) {
Expand Down
Loading