From e37f47eaef1b73f7c2aed714d3988252afd6bc58 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 16 Aug 2017 09:47:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-3738=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E6=A0=B7=E5=BC=8F=E4=B8=AD=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC=E9=A2=9C=E8=89=B2=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/icombobox/UIComboBoxUI.java | 4 ++-- .../design/gui/itextfield/UITextFieldUI.java | 3 ++- .../com/fr/design/style/AbstractSelectBox.java | 18 +++++------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java index 63ef53146..071820e03 100644 --- a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java +++ b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java @@ -57,12 +57,12 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener { super.paint(g, c); Graphics2D g2d = (Graphics2D) g; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - Color linecolor = UIConstants.TITLED_BORDER_COLOR; + Color linecolor = UIConstants.POP_DIALOG_BORDER; if (comboBox.isPopupVisible()) { arrowButton.setSelected(true); } else { - linecolor = UIConstants.TITLED_BORDER_COLOR; + linecolor = UIConstants.POP_DIALOG_BORDER; arrowButton.setSelected(false); } g2d.setColor(linecolor); 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 5f0eb3e47..54e9597a0 100644 --- a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java +++ b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java @@ -67,7 +67,8 @@ public class UITextFieldUI extends BasicTextFieldUI { g2d.setColor(UIConstants.TEXT_FILED_BORDER_SELECTED); g2d.drawRect(0, 0, width - 1, height - 1); } else { - GUIPaintUtils.drawBorder(g2d, 0, 0, width, height, isRound, rectDirection); + g2d.setColor(UIConstants.POP_DIALOG_BORDER); + g2d.drawRect(0, 0, width - 1, height - 1); } } diff --git a/designer_base/src/com/fr/design/style/AbstractSelectBox.java b/designer_base/src/com/fr/design/style/AbstractSelectBox.java index 58d1ec13d..f354c164f 100644 --- a/designer_base/src/com/fr/design/style/AbstractSelectBox.java +++ b/designer_base/src/com/fr/design/style/AbstractSelectBox.java @@ -38,12 +38,10 @@ public abstract class AbstractSelectBox extends AbstractPopBox implements Mou displayComponent.setEmptyBackground(); displayComponent.setBorder(new TriggleLineBorder()); triggleButton = new UIToggleButton(UIConstants.ARROW_DOWN_ICON); - triggleButton.setRoundBorder(true, Constants.LEFT); - triggleButton.setPreferredSize(new Dimension(21, 20)); + triggleButton.setPreferredSize(new Dimension(20, 20)); JPanel displayPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); displayPane.add(displayComponent, BorderLayout.CENTER); - displayComponent.setPreferredSize(new Dimension(preWidth, displayPane.getPreferredSize().height)); displayComponent.addMouseListener(mouseListener); @@ -59,7 +57,6 @@ public abstract class AbstractSelectBox extends AbstractPopBox implements Mou } public void ancestorRemoved(AncestorEvent evt) { - hidePopupMenu(); } public void ancestorMoved(AncestorEvent event) { @@ -74,8 +71,6 @@ public abstract class AbstractSelectBox extends AbstractPopBox implements Mou displayComponent.setEnabled(enabled); triggleButton.setEnabled(enabled); } - - @Override public JPanel initWindowPane(double preWidth) { @@ -88,8 +83,8 @@ public abstract class AbstractSelectBox extends AbstractPopBox implements Mou super.paint(g); Graphics2D g2d = (Graphics2D)g; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setColor(UIConstants.LINE_COLOR); - g2d.drawRoundRect(0, 0, this.getWidth() , this.getHeight() - 1, UIConstants.ARC, UIConstants.ARC); + g2d.setColor(UIConstants.POP_DIALOG_BORDER); + g2d.drawRoundRect(0, 0, this.getWidth() - 1 , this.getHeight() - 1, 4, 4); triggleButton.setSelected(isPopupVisible()); } @@ -105,15 +100,12 @@ public abstract class AbstractSelectBox extends AbstractPopBox implements Mou private class TriggleLineBorder extends AbstractBorder { private static final long serialVersionUID = 1065857667981063530L; - protected Insets borderInsets = new Insets(0, 0, 0, 1); + protected Insets borderInsets = new Insets(0, 0, 0, 0); public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { g.translate(x, y); - g.setColor(UIConstants.LINE_COLOR); - g.drawLine(3, 0, w-2, 0); - g.drawLine(3, h - 1, w-2, h - 1); - g.drawLine(w - 1, 0, w - 1, h); + g.setColor(UIConstants.POP_DIALOG_BORDER); g.translate(-x, -y); } From 8c7e35b81eae46b43266e74f7e9731b8cb7881d2 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 16 Aug 2017 09:54:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-3738=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E6=A0=B7=E5=BC=8F=E4=B8=AD=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC=E9=A2=9C=E8=89=B2=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BC=82=E5=B8=B8?= 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/utils/gui/GUIPaintUtils.java | 2 +- 2 files changed, 2 insertions(+), 3 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 54e9597a0..5f0eb3e47 100644 --- a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java +++ b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java @@ -67,8 +67,7 @@ public class UITextFieldUI extends BasicTextFieldUI { g2d.setColor(UIConstants.TEXT_FILED_BORDER_SELECTED); g2d.drawRect(0, 0, width - 1, height - 1); } else { - g2d.setColor(UIConstants.POP_DIALOG_BORDER); - g2d.drawRect(0, 0, width - 1, height - 1); + GUIPaintUtils.drawBorder(g2d, 0, 0, width, height, isRound, rectDirection); } } 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 434f60d9c..b6f52e199 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.TITLED_BORDER_COLOR); + g2d.setColor(UIConstants.POP_DIALOG_BORDER); } if (isRound) { g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);