Fix rendering of HTML list dots + better vertical align for them.

(cherry picked from commit fa4a404533ba1ef638fe523adc74391aee8a3ebf)

(cherry picked from commit 9f079c66e9)
(cherry picked from commit baf2f0b73f)
This commit is contained in:
Stanislav Dombrovsky
2017-09-08 14:10:21 +02:00
committed by jbrbot
parent 78519f62a3
commit 364c510f90

View File

@@ -2326,6 +2326,9 @@ public class StyleSheet extends StyleContext {
if (font != null) { if (font != null) {
g.setFont(font); g.setFont(font);
} }
Graphics2D g2 = (Graphics2D) g;
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
if (childtype == CSS.Value.SQUARE || childtype == CSS.Value.CIRCLE if (childtype == CSS.Value.SQUARE || childtype == CSS.Value.CIRCLE
|| childtype == CSS.Value.DISC) { || childtype == CSS.Value.DISC) {
drawShape(g, childtype, (int) x, (int) y, drawShape(g, childtype, (int) x, (int) y,
@@ -2391,7 +2394,7 @@ public class StyleSheet extends StyleContext {
// Position shape to the middle of the html text. // Position shape to the middle of the html text.
int gap = isLeftToRight ? - (bulletgap + size/3) : (aw + bulletgap); int gap = isLeftToRight ? - (bulletgap + size/3) : (aw + bulletgap);
int x = ax + gap; int x = ax + gap;
int y = Math.max(ay, ay + ah/2); int y = Math.max(ay, ay + ((ah - size/3)/2));
if (type == CSS.Value.SQUARE) { if (type == CSS.Value.SQUARE) {
g.drawRect(x, y, size/3, size/3); g.drawRect(x, y, size/3, size/3);