From 75be4229f606e35150e49cc988d3eba2d3d1c968 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 8 Aug 2017 21:31:15 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?= =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=3D=E3=80=8B=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=3D>=E9=82=AE?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/itextfield/UITextFieldUI.java | 3 --- designer_base/src/com/fr/design/javascript/EmailPane.java | 5 +++-- designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java index 5142c030ec..5f0eb3e476 100644 --- a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java +++ b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java @@ -51,9 +51,6 @@ public class UITextFieldUI extends BasicTextFieldUI { g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON); g2d.clip(roundShape); g2d.setColor(backgroundColor); - if(!textField.isEnabled()){ - g2d.setColor(UIConstants.NORMAL_BACKGROUND); - } g2d.fillRoundRect(1, 1, width - 2, height - 2, 0, 0); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_OFF); } diff --git a/designer_base/src/com/fr/design/javascript/EmailPane.java b/designer_base/src/com/fr/design/javascript/EmailPane.java index 02719d995b..92ac38f52a 100644 --- a/designer_base/src/com/fr/design/javascript/EmailPane.java +++ b/designer_base/src/com/fr/design/javascript/EmailPane.java @@ -2,6 +2,7 @@ package com.fr.design.javascript; import com.fr.base.ConfigManager; import com.fr.design.beans.FurtherBasicBeanPane; +import com.fr.design.constants.UIConstants; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; @@ -83,8 +84,8 @@ public class EmailPane extends FurtherBasicBeanPane { tipsPane1.setText(valid ? StringUtils.BLANK : Inter.getLocText("FR-Designer_EmailPane-warnings")); centerPane.setEnabled(valid); mainTextEditor.setEnabled(valid); - mainTextEditor.setBackground(valid ? Color.WHITE : new Color(244, 243, 233)); - mainTextEditor.setBorder(BorderFactory.createLineBorder(valid ? new Color(128, 152, 186) : new Color(201, 198,184))); + mainTextEditor.setBackground(valid ? Color.WHITE : UIConstants.DEFAULT_BG_RULER); + mainTextEditor.setBorder(BorderFactory.createLineBorder(valid ? new Color(128, 152, 186) : UIConstants.TITLED_BORDER_COLOR)); maitoEditor.setEnabled(valid); ccEditor.setEnabled(valid); bccEditor.setEnabled(valid); diff --git a/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java b/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java index 4c67686ac5..434f60d9c7 100644 --- a/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java +++ b/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java @@ -19,7 +19,7 @@ public class GUIPaintUtils { if (BaseUtils.isAuthorityEditing() && isAuthorityEdited) { g2d.setColor(UIConstants.AUTHORITY_LINE_COLOR); } else { - g2d.setColor(UIConstants.LINE_COLOR); + g2d.setColor(UIConstants.TITLED_BORDER_COLOR); } if (isRound) { g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);