archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 09:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8202013: JEditorPane shows large HTML unordered list bullets

Browse source 
8201925: JEditorPane unordered list bullets look pixelated

Reviewed-by: prr, pbansal
This commit is contained in:
Prasanta Sadhukhan 2018-09-05 15:56:49 +05:30
parent 78eb57c7a6
commit 75ec02926c
2 changed files with 211 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
View file

@ -2339,18 +2339,26 @@ public class StyleSheet extends StyleContext {
*/
void drawShape(Graphics g, CSS.Value type, int ax, int ay, int aw,
int ah, float align) {
// Align to bottom of shape.
int gap = isLeftToRight ? - (bulletgap + 8) : (aw + bulletgap);
final Object origAA = ((Graphics2D) g).getRenderingHint(
RenderingHints.KEY_ANTIALIASING);
((Graphics2D) g).setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
int size = g.getFont().getSize();
// Position shape to the middle of the html text.
int gap = isLeftToRight ? - (bulletgap + size/3) : (aw + bulletgap);
int x = ax + gap;
int y = Math.max(ay, ay + (int)(align * ah) - 8);
int y = Math.max(ay, ay + (int)Math.ceil(ah/2));
if (type == CSS.Value.SQUARE) {
g.drawRect(x, y, 8, 8);
g.drawRect(x, y, size/3, size/3);
} else if (type == CSS.Value.CIRCLE) {
g.drawOval(x, y, 8, 8);
g.drawOval(x, y, size/3, size/3);
} else {
g.fillOval(x, y, 8, 8);
g.fillOval(x, y, size/3, size/3);
}
((Graphics2D) g).setRenderingHint(RenderingHints.KEY_ANTIALIASING,
origAA);
}
/**