From da6ab7c32250c3c0eff7f6f99996bac80b4a18cc Mon Sep 17 00:00:00 2001 From: hzzz Date: Wed, 2 Aug 2017 10:04:12 +0800 Subject: [PATCH] grid --- designer/src/com/fr/grid/Grid.java | 2 +- designer/src/com/fr/grid/GridColumnUI.java | 3 +-- designer/src/com/fr/grid/GridRow.java | 2 +- designer/src/com/fr/grid/GridRowUI.java | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/designer/src/com/fr/grid/Grid.java b/designer/src/com/fr/grid/Grid.java index 01a2bb1d8..8c1eab748 100644 --- a/designer/src/com/fr/grid/Grid.java +++ b/designer/src/com/fr/grid/Grid.java @@ -57,7 +57,7 @@ public class Grid extends BaseGridComponent { transient private TemplateCellElement editingCellElement; private boolean showGridLine = true; - private Color gridLineColor = Color.lightGray; // line color. + private Color gridLineColor = new Color(0xF0F0F3); // line color. private boolean isShowPaginateLine = true; private Color paginationLineColor = Color.RED; // line color of paper diff --git a/designer/src/com/fr/grid/GridColumnUI.java b/designer/src/com/fr/grid/GridColumnUI.java index 36a011a93..748a0d2b8 100644 --- a/designer/src/com/fr/grid/GridColumnUI.java +++ b/designer/src/com/fr/grid/GridColumnUI.java @@ -27,8 +27,7 @@ import com.fr.report.elementcase.ElementCase; * @since 2012-3-22下午5:51:10 */ public class GridColumnUI extends ComponentUI { - - protected Color withoutDetailsBackground = Color.lightGray; + protected Color withoutDetailsBackground = new Color(0xF0F0F3); private int resolution ; public GridColumnUI(int resolution){ diff --git a/designer/src/com/fr/grid/GridRow.java b/designer/src/com/fr/grid/GridRow.java index 28a97e170..c80d08a4e 100644 --- a/designer/src/com/fr/grid/GridRow.java +++ b/designer/src/com/fr/grid/GridRow.java @@ -21,7 +21,7 @@ import javax.swing.plaf.ComponentUI; */ public class GridRow extends GridHeader { - private static final int MAX = 5; + private static final int MAX = 4; private int resolution = ScreenResolution.getScreenResolution(); private GridRowMouseHandler gridRowMouseHandler; diff --git a/designer/src/com/fr/grid/GridRowUI.java b/designer/src/com/fr/grid/GridRowUI.java index b03dbb414..5a6b874cd 100644 --- a/designer/src/com/fr/grid/GridRowUI.java +++ b/designer/src/com/fr/grid/GridRowUI.java @@ -26,7 +26,7 @@ import com.fr.report.elementcase.ElementCase; * @since 2012-3-22下午5:54:21 */ public class GridRowUI extends ComponentUI { - private Color detailsBackground = Color.lightGray; + private Color detailsBackground = new Color(0xF0F0F3); private int resolution ; GridRowUI(int resolution){ @@ -68,7 +68,7 @@ public class GridRowUI extends ComponentUI { rowTopHeight = Math.min(horizontalLineHeight, rowTopHeight); if (gridRow.getBackground() != null) { g2d.setPaint(this.detailsBackground); - GraphHelper.fill(g2d, new Rectangle2D.Double(0, 0, size.getWidth(), rowTopHeight)); + GraphHelper.fill(g2d, new Rectangle2D.Double(0, 0, size.getWidth(), rowTopHeight)); g2d.setPaint(gridRow.getBackground()); GraphHelper.fill(g2d, new Rectangle2D.Double(0, rowTopHeight, size.getHeight(), size.getHeight() - rowTopHeight)); }