From bdaac3381270b7ce8db589aebede53653184e8c2 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 10 Jul 2018 22:18:24 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-8947=2010.0=E6=B0=B4=E5=8D=B0=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84pdf=EF=BC=8C=E6=B0=B4=E5=8D=B0=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=8F=98=E5=B0=8F=E4=B8=94=E5=AD=97=E4=BD=93=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E9=94=AF=E9=BD=BF=E4=B8=A5=E9=87=8D=3D>=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=A4=A7=E5=B0=8F=E6=A0=A1=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-form/src/com/fr/design/mainframe/FormDesignerUI.java | 4 ++-- designer-realize/src/com/fr/grid/GridUI.java | 4 ++-- designer-realize/src/com/fr/poly/PolyDesignUI.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/designer-form/src/com/fr/design/mainframe/FormDesignerUI.java b/designer-form/src/com/fr/design/mainframe/FormDesignerUI.java index 959644ec8..e6b3c7fa8 100644 --- a/designer-form/src/com/fr/design/mainframe/FormDesignerUI.java +++ b/designer-form/src/com/fr/design/mainframe/FormDesignerUI.java @@ -120,8 +120,8 @@ public class FormDesignerUI extends ComponentUI { private void paintWatermark(Graphics2D g) { WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(designer.getTarget()); // 不要每次都 new 一个 WatermarkPainter - if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) { - watermarkPainter = new WatermarkPainter(watermark); + if (watermarkPainter == null || watermarkPainter.isOutDated(watermark, designer.getResolution())) { + watermarkPainter = new WatermarkPainter(watermark, designer.getResolution()); } watermarkPainter.paint(g, 0, designer.getParaHeight(), designer.getArea().getBounds()); } diff --git a/designer-realize/src/com/fr/grid/GridUI.java b/designer-realize/src/com/fr/grid/GridUI.java index 8577212dc..eee49676f 100644 --- a/designer-realize/src/com/fr/grid/GridUI.java +++ b/designer-realize/src/com/fr/grid/GridUI.java @@ -1106,8 +1106,8 @@ public class GridUI extends ComponentUI { WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(book); // 不要每次都 new 一个 WatermarkPainter - if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) { - watermarkPainter = new WatermarkPainter(watermark); + if (watermarkPainter == null || watermarkPainter.isOutDated(watermark, resolution)) { + watermarkPainter = new WatermarkPainter(watermark, resolution); } watermarkPainter.paint(g2d, gridSize.width, gridSize.height); } diff --git a/designer-realize/src/com/fr/poly/PolyDesignUI.java b/designer-realize/src/com/fr/poly/PolyDesignUI.java index 7b98269ea..d374d955f 100644 --- a/designer-realize/src/com/fr/poly/PolyDesignUI.java +++ b/designer-realize/src/com/fr/poly/PolyDesignUI.java @@ -114,8 +114,8 @@ public class PolyDesignUI extends ComponentUI { WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(book); // 不要每次都 new 一个 WatermarkPainter - if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) { - watermarkPainter = new WatermarkPainter(watermark); + if (watermarkPainter == null || watermarkPainter.isOutDated(watermark, resolution)) { + watermarkPainter = new WatermarkPainter(watermark, resolution); } watermarkPainter.paint(g2d, width, height); }