From 2475c5e55351d47b4beba9b08ab814cbc8f690c0 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Thu, 11 May 2017 10:31:55 +0800 Subject: [PATCH] rt --- .../fr/design/mainframe/alphafine/AlphaFineConstants.java | 4 ++++ .../alphafine/cell/cellRender/ContentCellRender.java | 2 +- .../alphafine/cell/cellRender/TitleCellRender.java | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/AlphaFineConstants.java b/designer/src/com/fr/design/mainframe/alphafine/AlphaFineConstants.java index c8604ed40e..dd4aadcbcb 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/AlphaFineConstants.java +++ b/designer/src/com/fr/design/mainframe/alphafine/AlphaFineConstants.java @@ -39,8 +39,12 @@ public class AlphaFineConstants { public static final Dimension CLOSE_BUTTON_SIZE = new Dimension(40, 40); + public static final Color WHITE = new Color(0xf9f9f9); + public static final Color GRAY = new Color(0xd2d2d2); + public static final Color LIGHT_GRAY = new Color(0xcccccc); + public static final Color BLUE = new Color(0x3394f0); public static final Color BLACK = new Color(0x222222); diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java b/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java index b5cf24d259..6f9a967cb0 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java @@ -40,7 +40,7 @@ public class ContentCellRender implements ListCellRenderer { name.setHorizontalTextPosition(SwingConstants.RIGHT); if (model.getDescription() != null) { content.setText("-" + model.getDescription()); - content.setForeground(new Color(0xcccccc)); + content.setForeground(AlphaFineConstants.LIGHT_GRAY); panel.add(content, BorderLayout.CENTER); } panel.add(name, BorderLayout.WEST); diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java b/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java index 1c0c3e159c..9e401de49c 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java @@ -21,14 +21,14 @@ public class TitleCellRender implements ListCellRenderer { public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { MoreModel moreModel = (MoreModel)value; JPanel panel = new JPanel(new BorderLayout()); - panel.setBackground(new Color(0xf9f9f9)); + panel.setBackground(AlphaFineConstants.WHITE); panel.setBorder(BorderFactory.createEmptyBorder(0,15,0,0)); name.setText(moreModel.getName()); name.setFont(AlphaFineConstants.SMALL_FONT); more.setFont(AlphaFineConstants.SMALL_FONT); more.setText(moreModel.getContent()); - name.setForeground(new Color(0x666666)); - more.setForeground(new Color(0x666666)); + name.setForeground(AlphaFineConstants.DARK_GRAY); + more.setForeground(AlphaFineConstants.DARK_GRAY); panel.add(name, BorderLayout.WEST); if (moreModel.isNeedMore()) { this.more.setBorder(BorderFactory.createEmptyBorder(0,0,0,10));