Browse Source

Merge pull request #876 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '80769ecbbc6fc7fd1f0cc08126e44ed3b433b5b4':
  REPORT-16871 【10.0.3回归】设计器语言切换为日语后,单元格边框线错位
bugfix/10.0
Hades 5 years ago
parent
commit
ec273f6f9e
  1. 9
      designer-base/src/main/java/com/fr/design/icon/BorderIcon.java

9
designer-base/src/main/java/com/fr/design/icon/BorderIcon.java

@ -22,16 +22,18 @@ public class BorderIcon implements Icon {
this.cellBorderStyle = cellBorderStyle; this.cellBorderStyle = cellBorderStyle;
} }
@Override
public int getIconHeight() { public int getIconHeight() {
return height; return height;
} }
@Override
public int getIconWidth() { public int getIconWidth() {
return width; return width;
} }
public static void drawLine(Graphics g, double x1, double y1, double x2, private void drawLine(Graphics g, double x1, double y1, double x2,
double y2, int lineStyle, Color color) { double y2, int lineStyle, Color color) {
g.setColor(color); g.setColor(color);
x1--; x1--;
@ -63,6 +65,7 @@ public class BorderIcon implements Icon {
} }
} }
@Override
public void paintIcon(Component c, Graphics g, int x, int y) { public void paintIcon(Component c, Graphics g, int x, int y) {
int defaultWidth = c.getWidth(); int defaultWidth = c.getWidth();
int defaultHeight = c.getHeight(); int defaultHeight = c.getHeight();
@ -81,9 +84,9 @@ public class BorderIcon implements Icon {
cellBorderStyle.getBottomColor()); cellBorderStyle.getBottomColor());
drawLine(gr, x1, y1, x1, y2, cellBorderStyle.getLeftStyle(), drawLine(gr, x1, y1, x1, y2, cellBorderStyle.getLeftStyle(),
cellBorderStyle.getLeftColor()); cellBorderStyle.getLeftColor());
drawLine(gr, defaultWidth / 2, x1, defaultWidth / 2, x2, drawLine(gr, defaultWidth / 2, y1, defaultWidth / 2, y2,
cellBorderStyle.getVerticalStyle(), cellBorderStyle.getVerticalColor()); cellBorderStyle.getVerticalStyle(), cellBorderStyle.getVerticalColor());
drawLine(gr, y1, defaultHeight / 2, y2, defaultHeight / 2, drawLine(gr, x1, defaultHeight / 2, x2, defaultHeight / 2,
cellBorderStyle.getHorizontalStyle(), cellBorderStyle.getHorizontalColor()); cellBorderStyle.getHorizontalStyle(), cellBorderStyle.getHorizontalColor());
} }

Loading…
Cancel
Save