From 075bfaff61b8b9cdd5bd03e18d7d638fc185017f Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Mon, 9 Jul 2018 01:31:11 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-8941=20=E3=80=9010.0=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E3=80=91?= =?UTF-8?q?=E5=86=B3=E7=AD=96=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/remote/ui/list/AddedMemberList.java | 2 +- .../remote/ui/list/AddedMemberListCellRender.java | 2 +- .../fr/design/remote/ui/list/AddingMemberList.java | 2 +- .../remote/ui/list/AddingMemberListCellRender.java | 13 ++++++++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/designer-base/src/com/fr/design/remote/ui/list/AddedMemberList.java b/designer-base/src/com/fr/design/remote/ui/list/AddedMemberList.java index a2631d66f..f1133a608 100644 --- a/designer-base/src/com/fr/design/remote/ui/list/AddedMemberList.java +++ b/designer-base/src/com/fr/design/remote/ui/list/AddedMemberList.java @@ -32,7 +32,7 @@ public class AddedMemberList extends MemberList { int rX = point.x; int rY = point.y; int index = this.getSelectedIndex(); - int x = 280; + int x = 270; int y = 25 * index; int width = 20; int height = 25; diff --git a/designer-base/src/com/fr/design/remote/ui/list/AddedMemberListCellRender.java b/designer-base/src/com/fr/design/remote/ui/list/AddedMemberListCellRender.java index 39dd08fb0..6bc894925 100644 --- a/designer-base/src/com/fr/design/remote/ui/list/AddedMemberListCellRender.java +++ b/designer-base/src/com/fr/design/remote/ui/list/AddedMemberListCellRender.java @@ -24,7 +24,7 @@ public class AddedMemberListCellRender extends JPanel implements ListCellRendere label = new UILabel(); label.setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png")); - label.setPreferredSize(new Dimension(270, 20)); + label.setPreferredSize(new Dimension(260, 20)); this.setPreferredSize(new Dimension(this.getPreferredSize().width, 25)); this.add(label); diff --git a/designer-base/src/com/fr/design/remote/ui/list/AddingMemberList.java b/designer-base/src/com/fr/design/remote/ui/list/AddingMemberList.java index 136d77cc1..6bcbf8354 100644 --- a/designer-base/src/com/fr/design/remote/ui/list/AddingMemberList.java +++ b/designer-base/src/com/fr/design/remote/ui/list/AddingMemberList.java @@ -43,7 +43,7 @@ public class AddingMemberList extends MemberList { int rX = point.x; int rY = point.y; int index = this.getSelectedIndex(); - int x = 280; + int x = 270; int y = 25 * index; int width = 25; int height = 25; diff --git a/designer-base/src/com/fr/design/remote/ui/list/AddingMemberListCellRender.java b/designer-base/src/com/fr/design/remote/ui/list/AddingMemberListCellRender.java index 0668d67f1..6900289a1 100644 --- a/designer-base/src/com/fr/design/remote/ui/list/AddingMemberListCellRender.java +++ b/designer-base/src/com/fr/design/remote/ui/list/AddingMemberListCellRender.java @@ -24,7 +24,7 @@ public class AddingMemberListCellRender extends JPanel implements ListCellRender this.setLayout(new FlowLayout(FlowLayout.LEFT)); label = new UILabel(); - label.setPreferredSize(new Dimension(270, 20)); + label.setPreferredSize(new Dimension(260, 20)); this.setPreferredSize(new Dimension(this.getPreferredSize().width, 25)); label.setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png")); @@ -39,8 +39,15 @@ public class AddingMemberListCellRender extends JPanel implements ListCellRender @Override public Component getListCellRendererComponent(JList list, RemoteDesignMember member, int index, boolean isSelected, boolean cellHasFocus) { - this.setLabelText(member.getRealName() + "(" + member.getUsername() + ")"); - check.setSelected(member.isSelected()); + + if (member.equals(RemoteDesignMember.DEFAULT_MEMBER)) { + this.setLabelText(member.getUsername()); + check.setVisible(false); + } else { + this.setLabelText(member.getRealName() + "(" + member.getUsername() + ")"); + check.setVisible(true); + check.setSelected(member.isSelected()); + } return this; }