Skip to content

Use OS#Polygon in GC#drawRectangleInPixels #2874

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

Draft
amartya4256 wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −30
Draft

Use OS#Polygon in GC#drawRectangleInPixels #2874

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
31 changes: 1 addition & 30 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 @@ -2309,36 +2309,7 @@ void apply() {
}

private void drawRectangleInPixels (int x, int y, int width, int height) {
checkGC(DRAW);
long gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
if (width < 0) {
x = x + width;
width = -width;
}
if (height < 0) {
y = y + height;
height = -height;
}
Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend);
Gdip.Graphics_DrawRectangle(gdipGraphics, data.gdipPen, x, y, width, height);
Gdip.Graphics_TranslateTransform(gdipGraphics, -data.gdipXOffset, -data.gdipYOffset, Gdip.MatrixOrderPrepend);
return;
}
if ((data.style & SWT.MIRRORED) != 0) {
/*
* Note that Rectangle() subtracts one pixel in MIRRORED mode when
* the pen was created with CreatePen() and its width is 0 or 1.
*/
if (data.lineWidth > 1) {
if ((data.lineWidth % 2) == 1) x++;
} else {
if (data.hPen != 0 && OS.GetObject(data.hPen, 0, 0) != OS.LOGPEN_sizeof()) {
x++;
}
}
}
OS.Rectangle (handle, x, y, x + width + 1, y + height + 1);
drawPolygonInPixels(new int[] {x, y, x + width + 1, y, x + width + 1, y + height + 1, x, y + height + 1});
}

/**
Expand Down
Loading