diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineColorButtonUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineColorButtonUI.java index 9f23998a66..278848606d 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineColorButtonUI.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineColorButtonUI.java @@ -24,8 +24,8 @@ import static com.fine.theme.utils.FineUIScale.scale; */ public class FineColorButtonUI extends FineButtonUI { - public static final float HEIGHT = 1.5f; - public static final float WIDTH = 13; + public static final float HEIGHT = 2.5f; + public static final float WIDTH = 14; public static final float Y = 13.5f; /** diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FinePanelUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FinePanelUI.java index e06fefd43c..735ddf81d7 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FinePanelUI.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FinePanelUI.java @@ -5,9 +5,10 @@ import com.formdev.flatlaf.ui.FlatPanelUI; import org.jetbrains.annotations.Nullable; import javax.swing.JComponent; -import javax.swing.JPanel; import javax.swing.plaf.ComponentUI; +import java.awt.Graphics; + import static com.fine.theme.utils.FineClientProperties.PANEL_TYPE; import static com.fine.theme.utils.FineClientProperties.ROUNDED_PANEL; @@ -36,15 +37,15 @@ public class FinePanelUI extends FlatPanelUI { } @Override - protected void installDefaults(JPanel p) { - super.installDefaults(p); - if (ROUNDED_PANEL.equals(getPanelTypeStr(p))) { + public void update(Graphics g, JComponent c) { + if (ROUNDED_PANEL.equals(getPanelTypeStr(c))) { this.arc = FineUIUtils.getUIInt("Panel.arc", "Component.arc"); } + super.update(g, c); } @Nullable - static String getPanelTypeStr(JPanel p) { + static String getPanelTypeStr(JComponent p) { Object value = p.getClientProperty(PANEL_TYPE); if (value instanceof String) { return (String) value; diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 6ea6b1775c..7e372efc1b 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -432,7 +432,6 @@ public class PreferencePane extends BasicPane { @NotNull private JPanel patchScroll(JPanel generalPane) { UIScrollPane uiScrollPane = new UIScrollPane(generalPane, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - uiScrollPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); return FineLayoutBuilder.asBorderLayoutWrapped(uiScrollPane); } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index 9e3ab4feb5..b070fd3eea 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -54,7 +54,6 @@ public class AboutPane extends JPanel { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO_OK")); //center panel JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); this.add(centerPane, BorderLayout.CENTER); JPanel contentPane = column().getComponent(); 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 faf4de9e34..0c072ba033 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 @@ -1,6 +1,7 @@ package com.fr.design.data.datapane; import com.fine.theme.icon.LazyIcon; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.TableData; import com.fr.data.MultiResultTableData; import com.fr.data.TableDataSource; @@ -96,6 +97,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; +import static com.fine.theme.utils.FineUIScale.scale; + public class TableDataTreePane extends BasicTableDataTreePane { private static final TableDataTreePane singleton = new TableDataTreePane(); @@ -257,7 +260,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { * @return */ private JPanel initTreePane() { - JPanel treePane = new JPanel(new BorderLayout(0, 6)); + JPanel treePane = new JPanel(new BorderLayout(0, scale(6))); // north JPanel northPane = new JPanel(FRGUIPaneFactory.createBorderLayout()); initServerDatasetAuthTipJPanel(); @@ -269,7 +272,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 ScaledEmptyBorder(4, 10, 10, 10)); return treePane; } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java index ac6a869a85..dd1e24be12 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java @@ -1,21 +1,25 @@ package com.fr.design.gui.frpane; -import com.fine.swing.ui.layout.Column; -import com.fine.theme.utils.FineUIStyle; +import com.fine.swing.ui.layout.Box; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.gui.ibutton.UIButtonGroup; +import com.fr.design.utils.ColorUtils; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.event.ChangeListener; import java.awt.BorderLayout; import java.awt.CardLayout; +import java.awt.Color; import java.awt.Component; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; import static com.fine.swing.ui.layout.Layouts.fix; import static com.fine.swing.ui.layout.Layouts.flex; import static com.fine.swing.ui.layout.Layouts.row; @@ -29,17 +33,19 @@ import static com.fine.theme.utils.FineClientProperties.ROUNDED_PANEL; * @since 11.0 * Created on 2024/05/14 */ -public class FineTabbedPane extends Column { +public class FineTabbedPane extends Box { private CardLayout cards; private JPanel centerPane; private final float headRatio; private final UIButtonGroup tabGroup; private final Map tabComponents; + private final int[] tabLayout; private FineTabbedPane(Map tabComponents, float headRatio, int[] tabLayout) { this.headRatio = headRatio; this.tabComponents = tabComponents; + this.tabLayout = tabLayout; String[] titleArray = tabComponents.keySet().toArray(new String[0]); this.tabGroup = new UIButtonGroup<>(titleArray, titleArray, tabLayout); @@ -110,7 +116,9 @@ public class FineTabbedPane extends Column { if (headRatio > 1) { throw new IllegalArgumentException("illegal headRatio argument!"); } - if (tabLayout != null && Arrays.stream(tabLayout).sum() != tabComponents.size()) { + if (tabLayout == null) { + tabLayout = new int[]{tabComponents.size()}; + } else if (Arrays.stream(tabLayout).sum() != tabComponents.size()) { throw new IllegalArgumentException("illegal tab layout argument!"); } return new FineTabbedPane(tabComponents, headRatio, tabLayout); @@ -118,6 +126,26 @@ public class FineTabbedPane extends Column { } private void initLayout() { + initCoreComponents(); + setMatchParentSize(true); + float flexRatio = (1 - headRatio) / 2; + int headHeight = FlatUIUtils.getUIInt("Component.defaultHeight",24) * tabLayout.length / 2; + add( + column( + row( + flex(flexRatio), cell(tabGroup).weight(headRatio), flex(flexRatio) + ), + flex() + ), + column( + fix(headHeight), + cell(centerPane).with(it -> it.setBorder(new ScaledEmptyBorder(headHeight + 10, 10, 10, 10))).weight(1) + ) + ); + fillBackgroundColor(); + } + + private void initCoreComponents() { cards = new CardLayout(); centerPane = new JPanel(cards); centerPane.putClientProperty(PANEL_TYPE, ROUNDED_PANEL); @@ -125,15 +153,12 @@ public class FineTabbedPane extends Column { value.setOpaque(false); centerPane.add(value, key); }); - float flexRatio = (1 - headRatio) / 2; - add( - row( - flex(flexRatio), cell(tabGroup).weight(headRatio), flex(flexRatio) - ), - fix(5), - cell(centerPane).weight(1).with(it -> FineUIStyle.setStyle(it, FineUIStyle.LIGHT_GREY)) - ); - setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); + } + + private void fillBackgroundColor() { + Color fillColor = FineUIUtils.getUIColor("FineTabbedPane.background", "fill.gray"); + Color defaultColor = FineUIUtils.getUIColor("default.background", "Component.background"); + ColorUtils.syncBackgroundIfAbsent(centerPane, fillColor, defaultColor); } private void initListeners() { diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java index 7a64b47c22..9002faf8b6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java @@ -2,11 +2,13 @@ package com.fr.design.gui.icontainer; import com.fine.theme.icon.LazyIcon; import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.base.vcs.DesignerMode; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; @@ -31,9 +33,13 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; +import static com.fine.theme.utils.FineClientProperties.PANEL_TYPE; +import static com.fine.theme.utils.FineClientProperties.ROUNDED_PANEL; +import static com.fine.theme.utils.FineUIScale.scale; + public class UIModeControlContainer extends JLayeredPane { private static final int ICON_WIDTH = 18; - private static int DIM_HEIGHT = 30; + private static int DIM_HEIGHT = 36; private static final int NUM32 = 32; private static final int NUM5 = 5; private JComponent upPane; @@ -284,16 +290,14 @@ public class UIModeControlContainer extends JLayeredPane { private class HidePane extends JPanel { public HidePane() { - setLayout(new FlowLayout(FlowLayout.CENTER, 10, -3)); - setBackground(UIConstants.NORMAL_BACKGROUND); - add(new UILabel("" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Panel") + "")); - LazyIcon paramViewIcon = new LazyIcon("param_view", ICON_WIDTH); - UIButton viewButton = new LargeButton(paramViewIcon, paramViewIcon, paramViewIcon) { - @Override - public Dimension getPreferredSize() { - return new Dimension(32, 32); - } - }; + setLayout(new FlowLayout(FlowLayout.CENTER, 10, 0)); + setBackground(FlatUIUtils.getUIColor("North.hidePane.background", UIConstants.NORMAL_BACKGROUND)); + UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Parameter_Panel")); + FineUIUtils.setFontSize(label, 14); + add(label); + LazyIcon paramViewIcon = new LazyIcon("param_view", 24); + LazyIcon paramViewPressedIcon = new LazyIcon("param_view_pressed", 24); + UIButton viewButton = new LargeButton(paramViewIcon, paramViewPressedIcon, paramViewPressedIcon); viewButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { @@ -302,17 +306,17 @@ public class UIModeControlContainer extends JLayeredPane { } }); add(viewButton); + putClientProperty(PANEL_TYPE, ROUNDED_PANEL); } @Override public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); - dim.height = DIM_HEIGHT; + dim.height = scale(DIM_HEIGHT); return dim; } } - private class AuthoritySheetInvisibleCoverPane extends JPanel { public AuthoritySheetInvisibleCoverPane() { setLayout(invisibleCoverLayout); diff --git a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java index 67f696569e..ed975ef20d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java +++ b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java @@ -1,7 +1,6 @@ package com.fr.design.gui.iprogressbar; -import com.fine.theme.utils.FineUIScale; -import com.fr.design.constants.UIConstants; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.dialog.UIDialog; import com.fr.design.gui.ilable.UILabel; import com.fr.design.os.impl.SupportOSImpl; @@ -19,6 +18,8 @@ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.Frame; +import static com.fine.theme.utils.FineUIScale.scale; + /** * 加载进度弹窗 * 使用注意点: @@ -29,7 +30,7 @@ import java.awt.Frame; public class ProgressDialog extends UIDialog { protected static final FRFont font = DesignUtils .getDefaultGUIFont() - .applySize(14) + .applySize(scale(14)) .applyForeground(new ColorUIResource(333334)); protected JProgressBar progressBar; @@ -59,7 +60,7 @@ public class ProgressDialog extends UIDialog { protected void initCenterDialog(Frame parent) { centerDialog = new JDialog(this); - centerDialog.setSize(FineUIScale.scale(new Dimension(482, 124))); + centerDialog.setSize(scale(new Dimension(482, 124))); centerDialog.setUndecorated(true); centerDialog.setLocationRelativeTo(parent); centerDialog.getContentPane().add(progressPanel); @@ -75,8 +76,8 @@ public class ProgressDialog extends UIDialog { protected void initProgressPanel() { progressPanel = new JPanel(); - progressPanel.setBorder(new UIProgressBorder(3, UIConstants.DEFAULT_BG_RULER, 14, 46, 47, 37, 47)); - progressPanel.setLayout(new BorderLayout(4, 15)); + progressPanel.setBorder(new ScaledEmptyBorder(46, 47, 37, 47)); + progressPanel.setLayout(new BorderLayout(scale(4), scale(15))); progressPanel.add(progressBar, BorderLayout.CENTER); text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Project"), JLabel.CENTER); text.setFont(font); diff --git a/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java b/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java index 5fa997a214..46d08e0bef 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java +++ b/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.Map; public class UIToolbar extends JToolBar { - int hgap = 2; + int hgap = 4; public UIToolbar() { this(FlowLayout.LEFT); diff --git a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java index 2477d4e2e9..903124a4ae 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java @@ -37,8 +37,9 @@ import java.util.HashSet; import java.util.Set; import static com.fine.swing.ui.layout.Layouts.cell; -import static com.fine.swing.ui.layout.Layouts.row; import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; /** * @author zhou @@ -107,14 +108,14 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse cell(outerToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("com/fr/design/images/m_format/out.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)).weight(3)), row( - cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border"), SwingConstants.LEFT)).weight(1.2), + flex(1.2), cell(externalPane).weight(3)), row( cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border"), SwingConstants.LEFT)).weight(1.2), cell(innerToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("com/fr/design/images/m_format/in.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)).weight(3)), row( - cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border"), SwingConstants.LEFT)).weight(1.2), + flex(1.2), cell(insidePane).weight(3)) ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, LayoutConstants.VERTICAL_GAP, 0))).getComponent(); } 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 35ff25489f..db9bb5ce4d 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 @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import static com.fine.theme.utils.FineUIScale.scale; import static com.fine.theme.utils.FineUIStyle.NORMAL_COLOR; import static com.fine.theme.utils.FineUIStyle.TOP_TOOLS; import static com.fine.theme.utils.FineUIStyle.setStyle; @@ -106,8 +107,8 @@ public class CenterRegionContainerPane extends JPanel { private void combineUpTooBar() { combineUp = new UIToolbar(FlowLayout.LEFT); setStyle(combineUp, TOP_TOOLS); - combineUp.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); - combineUp.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 2)); + combineUp.setBorder(new ScaledEmptyBorder(10, 5, 10, 10)); + combineUp.setLayout(new FlowLayout(FlowLayout.LEFT, scale(5), 0)); setUpUpToolBar(null); } @@ -237,7 +238,7 @@ public class CenterRegionContainerPane extends JPanel { toolbarPane.add(toolbarComponent = ad.resetToolBar(toolbarComponent, plus), BorderLayout.CENTER); setStyle(toolbarComponent, TOP_TOOLS); toolbarComponent.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); - toolbarComponent.setBorder(new ScaledEmptyBorder(0, 10, 0, 10)); + toolbarComponent.setBorder(new ScaledEmptyBorder(0, 5, 0, 10)); JPanel customNorthPane = strategy.customNorthPane(toolbarPane, plus); if (!isExist(customNorthPane)) { this.removeNorth(); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java index 79dfb5f68d..1ce37a4ba6 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java @@ -1,11 +1,12 @@ package com.fr.design.mainframe; +import com.fine.swing.ui.layout.Row; +import com.fine.swing.ui.layout.Spacer; import com.fine.theme.utils.FineUIStyle; import com.fr.design.DesignState; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.TitlePlaceProcessor; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.loghandler.LogMessageBar; import com.fr.design.mainframe.toolbar.ToolBarMenuDock; import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus; @@ -28,7 +29,6 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.FlowLayout; /** * @author shine @@ -80,7 +80,8 @@ public class NorthRegionContainerPane extends JPanel { protected JPanel initNorthEastPane(final ToolBarMenuDock ad) { //hugh: private修改为protected方便oem的时候修改右上的组件构成 //顶部日志+登陆按钮 - final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + final Row northEastPane = new Row(); + northEastPane.setSpacing(5); northEastPane.setOpaque(false); initPluginListener(northEastPane, ad); refreshNorthEastPane(northEastPane, ad); @@ -144,7 +145,6 @@ public class NorthRegionContainerPane extends JPanel { private void refreshNorthEastPane(final JPanel northEastPane, final ToolBarMenuDock ad) { northEastPane.removeAll(); - northEastPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0)); TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING); if (processor != null) { final Component[] bbsLoginPane = {null}; @@ -164,7 +164,7 @@ public class NorthRegionContainerPane extends JPanel { // northEastPane.add(ad.createGuideEntryPane()); northEastPane.add(ad.createNotificationCenterPane()); northEastPane.add(LogMessageBar.getInstance()); - + northEastPane.add(new Spacer(5)); OSSupportCenter.buildAction(new OSBasedAction() { @Override public void execute(Object... objects) { 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 947a6df38d..0400672c12 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 @@ -83,7 +83,7 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS contentPane.add(searchPane, SEARCH_PANE); contentPane.add(toolbarPane, TOOLBAR_PANE); cardLayout.show(contentPane, TOOLBAR_PANE); - contentPane.setBorder(new ScaledEmptyBorder(6, 8, 6, 8)); + contentPane.setBorder(new ScaledEmptyBorder(4, 8, 4, 8)); } private void initSearchPane() { diff --git a/designer-base/src/main/java/com/fr/design/search/view/TreeSearchRendererHelper.java b/designer-base/src/main/java/com/fr/design/search/view/TreeSearchRendererHelper.java index 0d2fd752c6..12e651dfed 100644 --- a/designer-base/src/main/java/com/fr/design/search/view/TreeSearchRendererHelper.java +++ b/designer-base/src/main/java/com/fr/design/search/view/TreeSearchRendererHelper.java @@ -1,10 +1,13 @@ package com.fr.design.search.view; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.gui.itree.refreshabletree.RefreshableJTree; +import com.fr.stable.StableUtils; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.TreeCellRenderer; +import java.awt.Color; import java.awt.Component; import java.util.regex.Pattern; @@ -67,7 +70,9 @@ public class TreeSearchRendererHelper { } private String getHighlightText(String text, String textToHighlight) { - String highLightTemplate = "$1"; + Color color = FlatUIUtils.getUIColor("text.highlight", Color.YELLOW); + String cssColor = StableUtils.javaColorToCSSColor(color); + String highLightTemplate = "$1"; if (textToHighlight.length() == 0) { return text; } diff --git a/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java b/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java index f189ccc300..dcb9738177 100644 --- a/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java @@ -1,5 +1,9 @@ package com.fr.design.utils; +import com.fr.general.ComparatorUtils; +import org.jetbrains.annotations.NotNull; + +import javax.swing.JScrollPane; import java.awt.Color; import java.awt.Component; import java.awt.Container; @@ -16,7 +20,7 @@ public class ColorUtils { * @param color 颜色 */ public static void syncBackground(Component component, Color color) { - + component.setBackground(color); if (component instanceof Container) { @@ -29,15 +33,17 @@ public class ColorUtils { } /** - * 递归的同步颜色，如何组件的背景颜色等于默认颜色的话，变更为 replaceColor + * 递归的同步颜色，如果组件的背景颜色等于默认颜色的话，变更为 replaceColor * * @param component 组件 * @param replaceColor 替换颜色 * @param defaultColor 默认颜色 */ - public static void syncBackgroundIfAbsent(Component component, Color replaceColor, Color defaultColor) { - - if (component.getBackground() != defaultColor) { + public static void syncBackgroundIfAbsent(Component component, Color replaceColor, @NotNull Color defaultColor) { + dealWithScrollPane(component, replaceColor, defaultColor); + + // 仅默认颜色时，递归替换 + if (!ComparatorUtils.equals(defaultColor, component.getBackground())) { return; } component.setBackground(replaceColor); @@ -49,7 +55,24 @@ public class ColorUtils { } } } - + + /** + * 滚动面板需处理view和scrollBar + */ + private static void dealWithScrollPane(Component component, Color replaceColor, Color defaultColor) { + if (component instanceof JScrollPane) { + JScrollPane scrollPane = (JScrollPane) component; + scrollPane.getViewport().setOpaque(false); + if (scrollPane.getVerticalScrollBar() != null) { + scrollPane.getVerticalScrollBar().setOpaque(false); + } + if (scrollPane.getHorizontalScrollBar() != null) { + scrollPane.getHorizontalScrollBar().setOpaque(false); + } + syncBackgroundIfAbsent(scrollPane.getViewport().getView(), replaceColor, defaultColor); + } + } + /** * 使背景透明 * diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg index 65e47758f6..a97fbf9678 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg @@ -1,10 +1,10 @@ - - - - - - - + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg index 9cfaf72f91..632acdb4b6 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg @@ -1,7 +1,5 @@ - - - - - - + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/templateFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/templateFile.svg new file mode 100644 index 0000000000..ef1d588c06 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/templateFile.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile.svg new file mode 100644 index 0000000000..21f0b95c04 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg index 4eb67dbe7c..6a25d2b26c 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg @@ -1,12 +1,10 @@ - - - - - - - - - - + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg index 768daca872..4282709c39 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg @@ -1,13 +1,10 @@ - - - - - - - - - - - - + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/view_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/view_disable.svg new file mode 100644 index 0000000000..00d8bbe403 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/view_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/view_pressed.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/view_pressed.svg new file mode 100644 index 0000000000..04a70dd037 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/view_pressed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/run.svg b/designer-base/src/main/resources/com/fine/theme/icon/run.svg new file mode 100644 index 0000000000..6540642f83 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/run.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/run_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/run_disable.svg new file mode 100644 index 0000000000..28768b617e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/run_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/run_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/run_white.svg new file mode 100644 index 0000000000..2502883512 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/run_white.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm.svg b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm.svg index db67adf7c2..c8584f2d92 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm.svg @@ -1,20 +1,24 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm_disable.svg index 209f893dc5..1a1b3f47d5 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm_disable.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm_disable.svg @@ -1,24 +1,24 @@ - - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet.svg b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet.svg index e3a3b480e9..c860d75b47 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet.svg @@ -1,24 +1,23 @@ - - - - - - - - + + + + - - - - - + + + + + - - - - - + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet_disable.svg index f40b7d35e1..8f5cb4ec9e 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet_disable.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet_disable.svg @@ -1,20 +1,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json index 34d8c06713..d51a85d4d5 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json @@ -12,6 +12,7 @@ "paste": "paste.svg", "undo": "undo.svg", "redo": "redo.svg", + "run": "run.svg", "version_save": "version_save.svg", "font_miss_check": "font_miss_check.svg", "template_theme": "template_theme.svg", @@ -187,6 +188,7 @@ "param_hide": "param/hide.svg", "param_hide_pressed": "param/hide_pressed.svg", "param_view": "param/view.svg", + "param_view_pressed": "param/view_pressed.svg", "param": "param/param.svg", "locked": "lock/locked.svg", "unlocked": "lock/unlocked.svg", 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 d38030bc6d..a37bb65096 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 @@ -672,7 +672,7 @@ ScrollBar.largeBar.thumbInsets = 0,4,0,4 ScrollBar.largeBar.buttonBackground = $ScrollBar.track #---- Panel ---- -Panel.arc = 20 +Panel.arc = 10 #---- ScrollPane ---- @@ -882,6 +882,10 @@ TemplateTabPane.borderWidth = 1 TemplateTabPane.tabArc = 5 TemplateTabPane.separatorHeight = 14 TemplateTabPane.icon.hoverBackground = #B8BFCB + +# ---- FineTabbedPane ---- +FineTabbedPane.background = #F2F4F8 + #---- Table ---- Table.rowHeight = 20 @@ -1179,6 +1183,7 @@ North.border = $defaultBorderColor North.messageLabel.foreground=$text.placeholder North.coverPane.background = #0a1c38 North.coverPane.radius = 8 +North.hidePane.background = #cdd1d7 # ---- Center ---- diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java index 42d6ea3777..ff4cf712ec 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java @@ -58,6 +58,8 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; +import static com.fine.theme.utils.FineUIScale.scale; + /** * 参数面板控件工具栏 * @@ -139,7 +141,7 @@ public class FormParaWidgetPane extends UIToolbar { } public FormParaWidgetPane() { - setLayout(new FlowLayout(FlowLayout.LEFT)); + setLayout(new FlowLayout(FlowLayout.LEFT, scale(5), 0)); initFormParaComponent(); } diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java index 5bae0b22d0..27085ec577 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java @@ -1,6 +1,5 @@ package com.fr.design.dscolumn; -import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseFormula; import com.fr.design.data.DesignTableDataManager; import com.fr.design.dialog.BasicPane; @@ -112,7 +111,6 @@ public class DSColumnAdvancedPane extends BasicPane { cell(wrapComponentWithTitle(valuePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Custom_Data_Appearance"))) ).getComponent()); } - contentPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java index a1b28bea88..378173577a 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java @@ -1,6 +1,5 @@ package com.fr.design.dscolumn; -import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.data.TableDataSource; import com.fr.design.dialog.BasicPane; import com.fr.design.expand.ConditionParentPane; @@ -55,7 +54,6 @@ public class DSColumnBasicPane extends BasicPane { public DSColumnBasicPane(int setting) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); if (setting > DSColumnPane.SETTING_DSRELATED) { selectDataColumnPane = new SelectedDataColumnPane(); diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java index 81be2bc66d..4a2ddec91e 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java @@ -2,7 +2,6 @@ package com.fr.design.dscolumn; import com.fine.swing.ui.layout.Column; import com.fine.theme.utils.FineUIUtils; -import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.data.TableDataSource; import com.fr.design.condition.DSColumnLiteConditionPane; import com.fr.design.condition.DSColumnSimpleLiteConditionPane; @@ -53,9 +52,7 @@ public class DSColumnConditionsPane extends BasicPane { liteConditionPane = new DSColumnSimpleLiteConditionPane(); } column.add(liteConditionPane); - column.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); this.add(column); - } @Override diff --git a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java index c8906b0e0b..643ba75175 100644 --- a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java @@ -1,5 +1,6 @@ package com.fr.design.javascript; +import com.fine.theme.utils.FineClientProperties; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.ExtraDesignClassManager; import com.fr.design.beans.BasicBeanPane; @@ -73,11 +74,11 @@ public class ListenerEditPane extends BasicBeanPane { nameText.setEditable(false); final List style = new ArrayList<>(Arrays.asList(JS, DBCOMMIT, CUSTOMACTION, EMAIL, MOBILEPOPUP)); styleBox = new UIComboBox(style.toArray()); + styleBox.putClientProperty(FineClientProperties.COMBO_BOX_TYPE, FineClientProperties.ADAPTIVE_COMBO_BOX); boolean workbook = DesignerContext.getDesignerFrame().getSelectedJTemplate().isJWorkBook(); if (workbook) { style.add(EXPORT); } - styleBox = new UIComboBox(style.toArray()); //事件名 JPanel eventName = row(LayoutConstants.HGAP_LARGE, cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Name"))), diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index 1cdd900a38..13acc023d2 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -301,7 +301,6 @@ public class PageSetupPane extends BasicPane { JPanel workPanel = new JPanel(new BorderLayout()); workPanel.add(defaultPane); - workPanel.setBorder(new ScaledEmptyBorder(10,10,10,10)); this.add(workPanel); } @@ -906,7 +905,6 @@ public class PageSetupPane extends BasicPane { JPanel workPanel = new JPanel(new BorderLayout()); workPanel.add(defaultPane); - workPanel.setBorder(new ScaledEmptyBorder(10,10,10,10)); this.add(workPanel); } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java b/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java index dd1ec883e8..f2653f4d34 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java @@ -1,6 +1,5 @@ package com.fr.design.webattr; -import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.beans.BasicBeanPane; import com.fr.design.constants.LayoutConstants; import com.fr.design.gui.ilable.UILabel; @@ -38,7 +37,6 @@ public class ErrorTemplatePane extends BasicBeanPane { cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exception_Stack_Trace"))) ) ).getComponent(); - northPane.setBorder(new ScaledEmptyBorder(10,10,10,10)); this.add(northPane); } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java index cdf103c95e..4667755370 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java @@ -73,7 +73,6 @@ public class PageToolBarPane extends AbstractEditToolBarPane { public PageToolBarPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(new ScaledEmptyBorder(10,10,10,10)); ButtonGroup buttonGroup = new ButtonGroup(); leftRadioButton.setSelected(true); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java index f6bdc7e193..6bc143f397 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java @@ -1,6 +1,5 @@ package com.fr.design.webattr; -import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.ConfigManager; import com.fr.config.Configuration; import com.fr.design.constants.LayoutConstants; @@ -45,7 +44,6 @@ public class ViewToolBarPane extends AbstractEditToolBarPane { public ViewToolBarPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); editToolBarButton.addActionListener(editBtnListener); isUseToolBarCheckBox.setSelected(true); isUseToolBarCheckBox.addActionListener(new ActionListener() { diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java index 240394940d..992fa8b289 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java @@ -37,7 +37,6 @@ public class WebCssPane extends BasicPane { public WebCssPane() { this.setLayout(new BorderLayout()); - this.setBorder(new ScaledEmptyBorder(10,10,10,10)); //磁盘文件 localText = new UITextField(); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java index 408d9aa459..230af34a8e 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java @@ -57,7 +57,6 @@ public class WebJsPane extends BasicPane { public WebJsPane() { this.setLayout(new BorderLayout()); - this.setBorder(new ScaledEmptyBorder(10,10,10,10)); localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File"), true); urlFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Url_Location"), false); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java index 35bc1b081d..1a6ecb0da8 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java @@ -62,7 +62,6 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { public WriteToolBarPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); //sheet标签页显示位置 ButtonGroup sheetButtonGroup = new ButtonGroup(); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java index cfea458dc5..aa9dee0e7f 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java @@ -60,7 +60,6 @@ public class PrintSettingPane extends BasicPane { printPane.add(nativePrintRadioButton.getText(), scrollPane); JPanel allPanel = column(LayoutConstants.VERTICAL_GAP, cell(north), cell(printPane)).getComponent(); - allPanel.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.add(allPanel, BorderLayout.CENTER); } diff --git a/designer-realize/src/main/java/com/fr/quickeditor/chartquick/PolyChartQuickEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/chartquick/PolyChartQuickEditor.java index f1584f9adb..99c8e7a68a 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/chartquick/PolyChartQuickEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/chartquick/PolyChartQuickEditor.java @@ -1,5 +1,6 @@ package com.fr.quickeditor.chartquick; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.chart.BaseChartCollection; import com.fr.design.designer.TargetComponent; import com.fr.design.gui.chart.BaseChartPropertyPane; @@ -8,7 +9,7 @@ import com.fr.design.selection.QuickEditor; import com.fr.poly.PolyDesigner; import com.fr.poly.creator.ChartBlockEditor; -import java.awt.*; +import java.awt.BorderLayout; public class PolyChartQuickEditor extends QuickEditor { @@ -26,6 +27,7 @@ public class PolyChartQuickEditor extends QuickEditor { add(editingPropertyPane = DesignModuleFactory.getChartPropertyPane(), BorderLayout.CENTER); editingPropertyPane.setSupportCellData(false); editingPropertyPane.populateChartPropertyPane(collection, tc); + setBorder(new ScaledEmptyBorder(0, 10, 0, 10)); } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/start/MainDesigner.java b/designer-realize/src/main/java/com/fr/start/MainDesigner.java index a796ad3882..8ab42ec873 100644 --- a/designer-realize/src/main/java/com/fr/start/MainDesigner.java +++ b/designer-realize/src/main/java/com/fr/start/MainDesigner.java @@ -353,7 +353,7 @@ public class MainDesigner extends BaseDesigner { } private UICombinationButton createRunButton() { - run = new UICombinationButton(new UISaveForbiddenButton(Toolkit.i18nText("Fine-Design_Basic_Preview"), new LazyIcon("add").white()), + run = new UICombinationButton(new UISaveForbiddenButton(Toolkit.i18nText("Fine-Design_Basic_Preview"), new LazyIcon("run").white()), new UISaveForbiddenButton(new LazyIcon("triangle_down").white())); run.addLeftClickLister(mouseEvent -> { JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();