From 18a88cf470a83b646c38c18106ca00233716bf6e Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 10 Oct 2017 16:05:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-4851=20[9.0=E6=8F=92=E4=BB=B6]?= =?UTF-8?q?=E6=90=9C=E7=B4=A2bug=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E6=8E=A5=E5=8F=A3=E8=A2=ABAlphaFine=E6=99=BA=E8=83=BD?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8D=A0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/DesignerFrame.java | 18 +++++++----------- .../mainframe/hold/DefaultTitlePlace.java | 14 -------------- 2 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 designer_base/src/com/fr/design/mainframe/hold/DefaultTitlePlace.java diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 5135cf299..080f0f985 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -10,7 +10,6 @@ import com.fr.design.DesignModelAdapter; import com.fr.design.DesignState; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; -import com.fr.design.actions.help.alphafine.AlphaFineConfigManager; import com.fr.design.constants.UIConstants; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.TableDataTreePane; @@ -27,7 +26,6 @@ import com.fr.design.gui.imenu.UIMenuHighLight; import com.fr.design.gui.iscrollbar.UIScrollBar; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.mainframe.hold.DefaultTitlePlace; import com.fr.design.mainframe.loghandler.LogMessageBar; import com.fr.design.mainframe.toolbar.ToolBarMenuDock; import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus; @@ -233,11 +231,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta basePane.add(centerPane, BorderLayout.CENTER); laoyoutWestPane(); -// JPanel eastRegionPane = new JPanel(new BorderLayout()); -// eastRegionPane.add(EastRegionContainerPane.getInstance(), BorderLayout.CENTER); -// eastRegionPane.add(JSliderPane.getInstance(), BorderLayout.SOUTH); -// basePane.add(eastRegionPane, BorderLayout.EAST); - basePane.add(EastRegionContainerPane.getInstance(), BorderLayout.EAST); basePane.setBounds(0, 0, contentWidth, contentHeight); @@ -334,14 +327,17 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta private void refreshNorthEastPane(JPanel northEastPane, ToolBarMenuDock ad) { northEastPane.removeAll(); + northEastPane.setOpaque(false); + northEastPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0)); + northEastPane.add(LogMessageBar.getInstance()); TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING); - if (processor == null) { - processor = new DefaultTitlePlace(); + if (processor != null) { + processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane()); } - processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane()); if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) { - northEastPane.add(ad.createAlphaFinePane(), BorderLayout.CENTER); + northEastPane.add(ad.createAlphaFinePane()); } + northEastPane.add(ad.createBBSLoginPane()); } diff --git a/designer_base/src/com/fr/design/mainframe/hold/DefaultTitlePlace.java b/designer_base/src/com/fr/design/mainframe/hold/DefaultTitlePlace.java deleted file mode 100644 index 0dee1644c..000000000 --- a/designer_base/src/com/fr/design/mainframe/hold/DefaultTitlePlace.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.fr.design.mainframe.hold; - -import com.fr.design.fun.impl.AbstractTitleProcessor; - -import java.awt.*; - -public class DefaultTitlePlace extends AbstractTitleProcessor { - - @Override - public void hold(Container container, Component loggerComponent, Component loginComponent) { - container.add(loggerComponent, BorderLayout.WEST); - container.add(loginComponent, BorderLayout.EAST); - } -} \ No newline at end of file From e0d58cac46881022834caa50eac49b23468fb269 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 10 Oct 2017 16:07:12 +0800 Subject: [PATCH 2/4] RT --- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 080f0f985..87369d459 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -325,7 +325,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta } private void refreshNorthEastPane(JPanel northEastPane, ToolBarMenuDock ad) { - northEastPane.removeAll(); northEastPane.setOpaque(false); northEastPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0)); From 6cc3bff6a4670aa9516e33afdf8b70a90b88bd4b Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 10 Oct 2017 16:08:22 +0800 Subject: [PATCH 3/4] RT --- .../fr/design/mainframe/alphafine/component/AlphaFinePane.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java index d4ab8326d..e6fb64634 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java @@ -21,6 +21,7 @@ public class AlphaFinePane extends BasicPane { private static AlphaFinePane alphaFinePane; public AlphaFinePane() { + setPreferredSize(new Dimension(24,24)); setLayout(new BorderLayout()); if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) { Toolkit.getDefaultToolkit().addAWTEventListener(AlphaFineDialog.listener(), AWTEvent.KEY_EVENT_MASK); From 3ad5ecf3df555c6e176b4ce86345ec7f03fd7f84 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 10 Oct 2017 16:10:31 +0800 Subject: [PATCH 4/4] RT --- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 87369d459..2a6efc31a 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -326,7 +326,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta private void refreshNorthEastPane(JPanel northEastPane, ToolBarMenuDock ad) { northEastPane.removeAll(); - northEastPane.setOpaque(false); northEastPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0)); northEastPane.add(LogMessageBar.getInstance()); TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING);