diff --git a/designer-base/src/com/fr/design/images/dialog/watermark/watermark_background.png b/designer-base/src/com/fr/design/images/dialog/watermark/watermark_background.png index 3c1ae71e1..5b407236d 100644 Binary files a/designer-base/src/com/fr/design/images/dialog/watermark/watermark_background.png and b/designer-base/src/com/fr/design/images/dialog/watermark/watermark_background.png differ diff --git a/designer-realize/src/com/fr/grid/GridUI.java b/designer-realize/src/com/fr/grid/GridUI.java index 7320b955c..96d44bb67 100644 --- a/designer-realize/src/com/fr/grid/GridUI.java +++ b/designer-realize/src/com/fr/grid/GridUI.java @@ -10,6 +10,7 @@ import com.fr.base.PaperSize; import com.fr.base.Utils; import com.fr.base.background.ColorBackground; import com.fr.base.background.ImageFileBackground; +import com.fr.base.iofileattr.WatermarkAttr; import com.fr.design.constants.UIConstants; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.mainframe.DesignerContext; @@ -22,7 +23,9 @@ import com.fr.grid.selection.CellSelection; import com.fr.grid.selection.FloatSelection; import com.fr.grid.selection.Selection; import com.fr.page.PaperSettingProvider; +import com.fr.page.ReportPage; import com.fr.page.ReportSettingsProvider; +import com.fr.page.WatermarkPainter; import com.fr.report.ReportHelper; import com.fr.report.cell.CellElement; import com.fr.report.cell.FloatElement; @@ -159,6 +162,9 @@ public class GridUI extends ComponentUI { // denny: make that the background can move with scroll paintScrollBackground(g2d, grid, background, psetting, reportSettings); } + + WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(((WorkSheet) elementCase).getBook()); + new WatermarkPainter(watermark).paint(g2d, this.back_or_selection_rect.getBounds()); } private void clearBackground(Graphics2D g2d, Grid grid) {