Skip to content

[Win32] Consider SWT.DRAW_DELIMITER flag when drawing text with GDI+ #3159

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
HeikoKlare merged 1 commit into from
Mar 31, 2026
Merged

[Win32] Consider SWT.DRAW_DELIMITER flag when drawing text with GDI+ #3159

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
3 changes: 3 additions & 0 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 @@ -3037,6 +3037,9 @@ private RectF drawText(long gdipGraphics, char[] buffer, int start, int length,
private void drawTextGDIP(long gdipGraphics, String string, int x, int y, int flags, boolean draw, Point size) {
boolean needsBounds = !draw || (flags & SWT.DRAW_TRANSPARENT) == 0;
char[] buffer;
if ((flags & SWT.DRAW_DELIMITER) == 0) {
string = string.replaceAll("[\\r\\n]+", "");
}
int length = string.length();
if (length != 0) {
buffer = string.toCharArray();
Expand Down
12 changes: 12 additions & 0 deletions ...e.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,18 @@ public void test_textExtentLjava_lang_StringI() {
assertEquals(SWT.ERROR_GRAPHIC_DISPOSED, e.code);
}

@Test
public void test_textExtentLjava_lang_StringI_disabledLineDelimiter() {
gc.setAdvanced(false);
Point ptWithoutAdvanced = gc.textExtent("abc\u4E2D" + System.lineSeparator() + "def", 0);
gc.setAdvanced(true);
Point ptWithAdvanced = gc.textExtent("abc\u4E2D" + System.lineSeparator() + "def", 0);
// Due to slightly different rendering, size must not be identical but similar in advanced/non-advanced mode
assertTrue(Math.abs(ptWithAdvanced.x - ptWithoutAdvanced.x) <= 2);
assertTrue(Math.abs(ptWithAdvanced.y - ptWithoutAdvanced.y) <= 2);
gc.dispose();
}

@Test
public void test_toString() {
String s = gc.toString();
Expand Down
Loading