From 42b35d346a3d3e1b42a3a56d7328dada218fbe6a Mon Sep 17 00:00:00 2001 From: vito Date: Fri, 29 Dec 2023 17:22:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-99485=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E5=BA=95=E8=89=B2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/datapane/TableDataTreePane.java | 10 ++-------- .../management/search/pane/TreeSearchToolbarPane.java | 2 -- .../fr/design/mainframe/CenterRegionContainerPane.java | 4 +++- .../design/mainframe/DesignerFrameFileDealerPane.java | 1 - .../control/pane/TemplateTreeSearchToolbarPane.java | 2 -- .../fr/design/mainframe/toolbar/ToolBarMenuDock.java | 7 +++---- .../fine/theme/light/ui/laf/FineLightLaf.properties | 4 +++- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index cadb62550..be8a8a2b1 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -10,7 +10,6 @@ import com.fr.design.DesignModelAdapter; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.actions.UpdateAction; -import com.fr.design.constants.UIConstants; import com.fr.design.data.BasicTableDataTreePane; import com.fr.design.data.BasicTableDataUtils; import com.fr.design.data.DesignTableDataManager; @@ -70,7 +69,6 @@ import com.fr.stable.core.PropertyChangeAdapter; import com.fr.workspace.WorkContext; import org.jetbrains.annotations.NotNull; -import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.JLabel; import javax.swing.JPanel; @@ -81,7 +79,6 @@ import javax.swing.border.EmptyBorder; import javax.swing.tree.TreePath; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Dimension; import java.awt.GridLayout; import java.awt.dnd.DnDConstants; import java.awt.event.ActionEvent; @@ -252,10 +249,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { toolBar.setBorderPainted(true); toolbarDef.updateToolBar(toolBar); - TreeSearchToolbarPane searchLayerdPane = new TreeSearchToolbarPane(toolBar); - searchLayerdPane.setPreferredSize(new Dimension(this.getWidth(), 23)); - - return searchLayerdPane; + return new TreeSearchToolbarPane(toolBar); } /** @@ -276,7 +270,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { treePane.add(northPane, BorderLayout.NORTH); treePane.add(remindPane, BorderLayout.CENTER); - treePane.setBorder(new EmptyBorder(10, 10,10,10)); + treePane.setBorder(new EmptyBorder(10, 10, 10, 10)); return treePane; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java index 8ee62bb21..29e2bca72 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java @@ -19,7 +19,6 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import java.awt.BorderLayout; import java.awt.CardLayout; -import java.awt.Dimension; import java.awt.Insets; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; @@ -73,7 +72,6 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha initSearchPane(); initContentPane(); add(contentPane, BorderLayout.CENTER); - setPreferredSize(new Dimension(240, 30)); TableDataTreeSearchManager.getInstance().registerTreeSearchStatusChangeListener(this); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java index 9f36dfddd..23199fb02 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe; +import com.fine.theme.utils.FineClientProperties; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.DesignState; import com.fr.design.base.mode.DesignModeContext; @@ -88,7 +89,6 @@ public class CenterRegionContainerPane extends JPanel { centerTemplateCardPane.setBorder(new ScaledEmptyBorder(0, 10, 10, 10)); this.add(toolbarPane, BorderLayout.NORTH); this.setBackground(UIManager.getColor("Center.SpaceColor")); - this.setBorder(new ScaledEmptyBorder(0, 0, 10, 0)); } public ToolBarMenuDock getToolBarMenuDock() { @@ -100,6 +100,7 @@ public class CenterRegionContainerPane extends JPanel { */ private void combineUpTooBar() { combineUp = new UIToolbar(FlowLayout.LEFT); + FineClientProperties.setStyle(combineUp, "topTools"); combineUp.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); combineUp.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 2)); setUpUpToolBar(null); @@ -221,6 +222,7 @@ public class CenterRegionContainerPane extends JPanel { // 颜色，字体那些按钮的工具栏 toolbarPane.add(toolbarComponent = ad.resetToolBar(toolbarComponent, plus), BorderLayout.CENTER); + FineClientProperties.setStyle(toolbarComponent, "topTools"); toolbarComponent.setBorder(new ScaledEmptyBorder(0, 10, 10, 10)); JPanel customNorthPane = strategy.customNorthPane(toolbarPane, plus); if (!isExist(customNorthPane)) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 901a37a9c..387dfece1 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -175,7 +175,6 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt searchToolbarPane = new TemplateTreeSearchToolbarPane(toolBar); searchToolbarPane.add(createUpToolBarPane(), BorderLayout.EAST); - searchToolbarPane.setPreferredSize(new Dimension(this.getWidth(), 23)); add(searchToolbarPane, BorderLayout.NORTH); CardLayout card; JPanel cardPane = new JPanel(card = new CardLayout()); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java index e12050c18..cfb080913 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java @@ -22,7 +22,6 @@ import javax.swing.event.DocumentListener; import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Color; -import java.awt.Dimension; import java.awt.Insets; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; @@ -91,7 +90,6 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS initSearchPane(); initContentPane(); add(contentPane, BorderLayout.CENTER); - setPreferredSize(new Dimension(240, 30)); TemplateTreeSearchManager.getInstance().registerTreeSearchStatusChangeListener(this); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index ce7190102..c147ccc4f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -52,10 +52,10 @@ import com.fr.design.fun.PluginManagerProvider; import com.fr.design.fun.TableDataPaneProcessor; import com.fr.design.gui.UILookAndFeel; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ibutton.UICombinationButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.imenu.UIMenu; import com.fr.design.gui.imenu.UIMenuBar; -import com.fr.design.gui.itoolbar.UILargeToolbar; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.locale.impl.SupportLocaleImpl; import com.fr.design.mainframe.JTemplate; @@ -98,7 +98,6 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Font; import java.util.ArrayList; import java.util.Arrays; @@ -766,8 +765,8 @@ public abstract class ToolBarMenuDock { * * @return 大的工具按钮 */ - public UILargeToolbar createLargeToolbar() { - return new UILargeToolbar(FlowLayout.LEFT); + public UICombinationButton createLargeToolbar() { + return new UICombinationButton(); } /** diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties index 88e185f0a..c07e64483 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties @@ -1092,7 +1092,6 @@ ToolBar.arrowKeysOnlyNavigation = true ToolBar.hoverButtonGroupArc = 8 ToolBar.floatable = false ToolBar.gripColor = @icon -ToolBar.background = #fff ToolBar.dockingBackground = darken($ToolBar.background,5%) ToolBar.dockingForeground = $Component.borderColor ToolBar.floatingBackground = $ToolBar.background @@ -1260,6 +1259,9 @@ CellOtherSetPane.height=$Component.defaultHeight background : @BrandColor; \ arc : 3 +[style]ToolBar.topTools = \ + background: #fff + #---- clearButton ---- # for clear/cancel button in text fields From 68930250711dfc0a91d99a72f5ed696e6acd569f Mon Sep 17 00:00:00 2001 From: vito Date: Fri, 29 Dec 2023 17:25:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/file/MultiTemplateTabPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java index b89019cd4..8659bcd95 100644 --- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java @@ -68,7 +68,7 @@ public class MultiTemplateTabPane extends JPanel { private static final int SMALLGAP = 4; private static final int TRAILING_WIDTH = 34; - private static final int LEADING_WIDTH = 38; + private static final int LEADING_WIDTH = 0; //每个标签页的最大的长度和最小长度。这些长度均为均分