diff options
| author | Felipe Heidrich <fheidric> | 2005-10-20 22:25:00 +0000 |
|---|---|---|
| committer | Felipe Heidrich <fheidric> | 2005-10-20 22:25:00 +0000 |
| commit | 4adc0fa9f03279720a68fba8d51956d0da465d22 (patch) | |
| tree | 8b1a32bf2bae442eeca4e29ec87eb6999f696d93 | |
| parent | 6a813c0617ac8488370f9ff20aedd26c6cadafff (diff) | |
| download | eclipse.platform.swt-4adc0fa9f03279720a68fba8d51956d0da465d22.tar.gz eclipse.platform.swt-4adc0fa9f03279720a68fba8d51956d0da465d22.tar.xz eclipse.platform.swt-4adc0fa9f03279720a68fba8d51956d0da465d22.zip | |
*** empty log message ***
2 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/textlayout/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/textlayout/org/eclipse/swt/graphics/TextLayout.java index e14d10b4b3..f5afd30c04 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/textlayout/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/textlayout/org/eclipse/swt/graphics/TextLayout.java @@ -354,7 +354,7 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col String string = text.substring(run.start, run.start + run.length); gc.drawString(string, drawX, drawRunY, true); if (run.style != null && run.style.underline) { - int underlineY = drawRunY + run.ascent + 1; + int underlineY = drawRunY + run.ascent + 1 - run.style.rise; gc.drawLine (drawX, underlineY, drawX + run.width, underlineY); } if (run.style != null && run.style.strikeout) { @@ -376,7 +376,7 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col if (!(run.style != null && run.style.metrics != null)) { gc.drawString(string, drawX, drawRunY, true); if (run.style != null && run.style.underline) { - int underlineY = drawRunY + run.ascent + 1; + int underlineY = drawRunY + run.ascent + 1 - run.style.rise; gc.drawLine (drawX, underlineY, drawX + run.width, underlineY); } if (run.style != null && run.style.strikeout) { @@ -398,7 +398,7 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col gc.setForeground(selectionForeground); gc.drawString(string, selX, drawRunY, true); if (run.style != null && run.style.underline) { - int underlineY = drawRunY + run.ascent + 1; + int underlineY = drawRunY + run.ascent + 1 - run.style.rise; gc.drawLine (selX, underlineY, selX + selWidth, underlineY); } if (run.style != null && run.style.strikeout) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/TextLayout.java index bae6c57230..d6bb3e747d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/TextLayout.java @@ -368,7 +368,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo gc.setForeground(selectionForeground); gc.drawString(string, drawX, drawRunY, true); if (run.style != null && run.style.underline) { - int underlineY = drawRunY + run.baseline + 1; + int underlineY = drawRunY + run.baseline + 1 - run.style.rise; gc.drawLine (drawX, underlineY, drawX + run.width, underlineY); } if (run.style != null && run.style.strikeout) { @@ -389,7 +389,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo if (!(run.style != null && run.style.metrics != null)) { gc.drawString(string, drawX, drawRunY, true); if (run.style != null && run.style.underline) { - int underlineY = drawRunY + run.baseline + 1; + int underlineY = drawRunY + run.baseline + 1 - run.style.rise; gc.drawLine (drawX, underlineY, drawX + run.width, underlineY); } if (run.style != null && run.style.strikeout) { @@ -411,7 +411,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo gc.setForeground(selectionForeground); gc.drawString(string, selX, drawRunY, true); if (run.style != null && run.style.underline) { - int underlineY = drawRunY + run.baseline + 1; + int underlineY = drawRunY + run.baseline + 1 - run.style.rise; gc.drawLine (selX, underlineY, selX + selWidth, underlineY); } if (run.style != null && run.style.strikeout) { |