diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java index 17a5f62791..a123f3540f 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java @@ -174,6 +174,7 @@ public class FineLightIconSet extends AbstractIconSet { new SvgIconSource("tool_edit", "com/fine/theme/icon/toolbar/edit.svg", true), new SvgIconSource("tool_edit_white", "com/fine/theme/icon/toolbar/edit_white.svg", true), new SvgIconSource("tool_more", "com/fine/theme/icon/toolbar/more.svg", true), + new SvgIconSource("tool_more_hover", "com/fine/theme/icon/toolbar/more_hover.svg"), // 参数面板 new SvgIconSource("param_edit", "com/fine/theme/icon/param/edit.svg", true, 24), diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineTemplateTabPaneUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineTemplateTabPaneUI.java index bc15747ed0..3290d5bd22 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineTemplateTabPaneUI.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineTemplateTabPaneUI.java @@ -26,6 +26,8 @@ import java.awt.geom.Rectangle2D; import static com.fine.theme.utils.FineUIScale.scale; import static com.fine.theme.utils.FineUIUtils.paintRoundTabBorder; import static com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import static com.fr.design.file.MultiTemplateTabPane.LEADING_WIDTH; +import static com.fr.design.file.MultiTemplateTabPane.TRAILING_WIDTH; /** * 文件Tab栏UI @@ -39,9 +41,6 @@ public class FineTemplateTabPaneUI extends PanelUI { private static final String ELLIPSIS = "..."; private static final int ICON_TEXT_GAP = 4; - private static final int LEADING_WIDTH = 0; - private static final int TRAILING_WIDTH = 34; - @Styleable(dot = true) protected Color background; @@ -111,7 +110,7 @@ public class FineTemplateTabPaneUI extends PanelUI { closeHoverIcon = new LazyIcon("clear_hover"); addAction = new LazyIcon("add_worksheet"); moreAction = new LazyIcon("tool_more"); - moreHoverAction = new LazyIcon("clear_hover"); + moreHoverAction = new LazyIcon("tool_more_hover"); fileIcon = new LazyIcon("cpt_icon"); leadingWidth = scale(LEADING_WIDTH); trailingWidth = scale(TRAILING_WIDTH); @@ -231,7 +230,7 @@ public class FineTemplateTabPaneUI extends PanelUI { int x = leadingWidth + (int) tabPaneWidth + (trailingWidth - moreAction.getIconWidth()) / 2; int y = (tabHeight - moreAction.getIconHeight()) / 2; if (tabPane.isHoverMoreAction()) { - closeHoverIcon.paintIcon(tabPane, g2d, x, y); + moreHoverAction.paintIcon(tabPane, g2d, x, y); } else { moreAction.paintIcon(tabPane, g2d, x, y); } diff --git a/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java b/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java index 48a6490015..1e029ed551 100644 --- a/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java +++ b/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java @@ -25,6 +25,7 @@ public interface FineUIStyle { String NORMAL_COLOR = "normalColor"; String TOP_TOOLS = "topTools"; String BRAND_COLOR_LABEL = "brandColorLabel"; + String BUTTON_TAB_ACTION = "tabAction"; /** 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 e6e6155759..9a0892d865 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 @@ -1,12 +1,16 @@ package com.fr.design.file; +import com.fine.swing.ui.layout.Layouts; +import com.fine.swing.ui.layout.Row; import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; import com.fr.base.vcs.DesignerMode; import com.fr.design.actions.UpdateAction; import com.fr.design.actions.file.LocateAction; import com.fr.design.constants.UIConstants; import com.fr.design.dialog.FineJOptionPane; +import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.imenu.UIPopupMenu; import com.fr.design.gui.imenu.UIScrollPopUpMenu; @@ -29,8 +33,8 @@ import com.fr.workspace.server.lock.TplOperator; import javax.swing.BorderFactory; import javax.swing.Icon; +import javax.swing.JButton; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JSeparator; import javax.swing.MenuElement; import javax.swing.SwingUtilities; @@ -40,6 +44,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; @@ -47,7 +52,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import static com.fine.theme.utils.FineClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON; import static com.fine.theme.utils.FineUIScale.scale; +import static com.fine.theme.utils.FineUIStyle.BUTTON_TAB_ACTION; +import static com.formdev.flatlaf.FlatClientProperties.BUTTON_TYPE; import static com.fr.design.dialog.FineJOptionPane.showConfirmDialog; import static javax.swing.JOptionPane.OK_CANCEL_OPTION; import static javax.swing.JOptionPane.OK_OPTION; @@ -61,14 +69,21 @@ import static javax.swing.JOptionPane.WARNING_MESSAGE; *

* created by daisy on 2013/08/05 **/ -public class MultiTemplateTabPane extends JPanel { +public class MultiTemplateTabPane extends Row { private static final String UI_CLASS_ID = "TemplateTabPaneUI"; private static final int GAP = 6; private static final int SMALLGAP = 4; - private static final int TRAILING_WIDTH = 34; - private static final int LEADING_WIDTH = 0; + /** + * 尾部动作区宽度 + */ + public static final int TRAILING_WIDTH = 34; + + /** + * 前导动作区宽度 + */ + public static final int LEADING_WIDTH = 38; //每个标签页的最大的长度和最小长度。这些长度均为均分 @@ -101,6 +116,7 @@ public class MultiTemplateTabPane extends JPanel { private boolean hoverMoreAction = false; private Icon clodeIcon = new LazyIcon("clear"); private boolean isShowList = false; + private JButton leadingActionButton; //自动新建的模板B若没有进行任何编辑，切换到其他 // @@ -127,6 +143,7 @@ public class MultiTemplateTabPane extends JPanel { * 多工作簿面板 */ public MultiTemplateTabPane() { + this.addMouseListener(new MultiTemplateTabMouseListener()); this.addMouseMotionListener(new MultiTemplateTabMouseMotionListener()); this.setBorder(null); @@ -171,6 +188,28 @@ public class MultiTemplateTabPane extends JPanel { } } }); + add( + Layouts.cell(new UIButton(new LazyIcon("add_worksheet"))).with(it -> { + it.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_TOOLBAR_BUTTON); + FineUIStyle.setStyle(it, BUTTON_TAB_ACTION); + it.setFocusPainted(false); + leadingActionButton = it; + }) + ); + } + + /** + * 为前导动作添加监听 + * + * @param l 监听器 + */ + public void addLeadingAction(ActionListener l) { + leadingActionButton.removeActionListener(l); + leadingActionButton.addActionListener(l); + } + + public void setLeadingActionEnable(boolean enable){ + leadingActionButton.setEnabled(enable); } diff --git a/designer-base/src/main/java/com/fr/design/file/NewTemplatePane.java b/designer-base/src/main/java/com/fr/design/file/NewTemplatePane.java deleted file mode 100644 index 256ddccd27..0000000000 --- a/designer-base/src/main/java/com/fr/design/file/NewTemplatePane.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.fr.design.file; - -import com.fr.base.BaseUtils; -import com.fr.base.vcs.DesignerMode; -import com.fr.design.constants.UIConstants; -import com.fr.design.mainframe.DesignerContext; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; -import java.awt.geom.Line2D; -import java.awt.geom.Rectangle2D; - -// todo: 自己绘制组件 -/** - * Author : daisy - * Date: 13-8-27 - * Time: 下午6:07 - */ -public abstract class NewTemplatePane extends JComponent implements MouseListener, MouseMotionListener { - - private static final Icon GRAY_NEW_CPT = BaseUtils.readIcon("/com/fr/design/images/buttonicon/additicon_grey.png"); - private static final int ICON_START_X = 5; - private static final int HEIGHT = 26; - private Graphics2D g2d; - private Icon newWorkBookIconMode = null; - - - public NewTemplatePane() { - newWorkBookIconMode = getNew(); - this.setLayout(new BorderLayout(0, 0)); - this.addMouseListener(this); - this.addMouseMotionListener(this); - this.setBorder(null); - } - - public Dimension getPreferredSize() { - Dimension dim = super.getPreferredSize(); - dim.width = HEIGHT; - return dim; - } - - - public void paintComponent(Graphics g) { - super.paintComponent(g); - g2d = (Graphics2D) g; - g2d.setColor(getBackground()); - g2d.fill(new Rectangle2D.Double(0, 0, getWidth(),getHeight())); - int sheetIconY = (getHeight() - newWorkBookIconMode.getIconHeight()) / 2; - newWorkBookIconMode.paintIcon(this, g2d, ICON_START_X, sheetIconY); -// paintUnderLine(g2d); - } - - - private void paintUnderLine(Graphics2D g2d) { - //画下面的那条线 - g2d.setPaint(UIConstants.LINE_COLOR); - g2d.draw(new Line2D.Double((float) 0, (float) (getHeight()-1), getWidth(), (float) (getHeight()-1))); - } - - /** - *鼠标点击 - * @param e 事件 - */ - public void mouseClicked(MouseEvent e) { - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } - } - - /** - *鼠标按下 - * @param e 事件 - */ - public void mousePressed(MouseEvent e) { - int evtX = e.getX(); - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } - if (isOverNewIcon(evtX) && newWorkBookIconMode != GRAY_NEW_CPT) { - newWorkBookIconMode = getMousePressNew(); - createNewTemplate(); - } - this.repaint(); - } - - - /** - * 新建模板 - */ - protected void createNewTemplate() { - DesignerContext.getDesignerFrame().addAndActivateJTemplate(); - } - - /** - *鼠标松开 - * @param e 事件 - */ - public void mouseReleased(MouseEvent e) { - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } - } - - /** - *鼠标进入 - * @param e 事件 - */ - public void mouseEntered(MouseEvent e) { - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } - } - - /** - *鼠标离开 - * @param e 事件 - */ - public void mouseExited(MouseEvent e) { - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } else { - newWorkBookIconMode = getNew(); - } - - this.repaint(); - } - - /** - *鼠标拖拽 - * @param e 事件 - */ - public void mouseDragged(MouseEvent e) { - } - - /** - *鼠标移动 - * @param e 事件 - */ - public void mouseMoved(MouseEvent e) { - int evtX = e.getX(); - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } else if (isOverNewIcon(evtX)) { - newWorkBookIconMode = getMouseOverNew(); - } - - this.repaint(); - - } - - private boolean needGrayNewCpt() { - return DesignerMode.isAuthorityEditing() || DesignerMode.isVcsMode(); - } - - - private boolean isOverNewIcon(int evtX) { - return (evtX >= ICON_START_X && evtX <= ICON_START_X + newWorkBookIconMode.getIconWidth()); - } - - public void setButtonGray(boolean isGray) { - newWorkBookIconMode = isGray ? GRAY_NEW_CPT : getNew(); - } - - public abstract Icon getNew(); - - public abstract Icon getMouseOverNew(); - - public abstract Icon getMousePressNew(); - -} 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 327e07c3c2..54944f2d30 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 @@ -5,7 +5,6 @@ import com.fr.design.DesignState; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.MultiTemplateTabPane; -import com.fr.design.file.NewTemplatePane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UICombinationButton; import com.fr.design.gui.itoolbar.UIToolbar; @@ -53,8 +52,7 @@ public class CenterRegionContainerPane extends JPanel { private UIToolbar combineUp;//撤销重做 等工具栏 - private JPanel templateTabPane;//新建模板 + 模板tab标签 - private NewTemplatePane newWorkBookPane;//新建模板button + private MultiTemplateTabPane templateTabPane;//新建模板 + 模板tab标签 public static CenterRegionContainerPane getInstance() { @@ -77,8 +75,7 @@ public class CenterRegionContainerPane extends JPanel { largeToolbar = getToolBarMenuDock().createLargeToolbar(); eastCenterPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); combineUpTooBar(); - templateTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - newWorkBookPane = getToolBarMenuDock().getNewTemplatePane(); + templateTabPane = initTemplateTabPane(); eastCenterPane.add(templateTabPane, BorderLayout.NORTH); eastCenterPane.add(combineUp, BorderLayout.CENTER); @@ -92,6 +89,13 @@ public class CenterRegionContainerPane extends JPanel { setStyle(this, NORMAL_COLOR); } + private MultiTemplateTabPane initTemplateTabPane() { + MultiTemplateTabPane templateTabPane = MultiTemplateTabPane.getInstance(); + templateTabPane.addLeadingAction(e -> + DesignerContext.getDesignerFrame().addAndActivateJTemplate()); + return templateTabPane; + } + public ToolBarMenuDock getToolBarMenuDock() { return DesignerContext.getDesignerFrame().getToolBarMenuDock(); } @@ -230,18 +234,12 @@ public class CenterRegionContainerPane extends JPanel { this.removeNorth(); this.add(customNorthPane, BorderLayout.NORTH); } - if (strategy.hasTemplateTabPane(plus)) { - eastCenterPane.add(templateTabPane, BorderLayout.NORTH); - } else { - eastCenterPane.remove(templateTabPane); - } if (strategy.hasCombineUp(plus)) { eastCenterPane.add(combineUp, BorderLayout.CENTER); } else { eastCenterPane.remove(combineUp); } - resetByDesignMode(); } private void removeNorth() { @@ -264,18 +262,6 @@ public class CenterRegionContainerPane extends JPanel { return false; } - private void resetByDesignMode() { - if (DesignModeContext.isDuchampMode()) { -// eastPane.remove(largeToolbar); - //移除新建模板按钮 - templateTabPane.remove(newWorkBookPane); - } else { -// eastPane.add(largeToolbar, BorderLayout.WEST); - templateTabPane.add(newWorkBookPane, BorderLayout.WEST); - - } - } - JComponent getToolbarComponent() { @@ -286,8 +272,7 @@ public class CenterRegionContainerPane extends JPanel { * 判断是否在权限编辑状态，若是在权限编辑状态，则需要有虚线框和关闭突变 */ protected void needToAddAuhtorityPaint() { - newWorkBookPane.setButtonGray(DesignModeContext.isAuthorityEditing()); - + MultiTemplateTabPane.getInstance().setLeadingActionEnable(DesignModeContext.isAuthorityEditing()); } @@ -309,7 +294,7 @@ public class CenterRegionContainerPane extends JPanel { * 重置下RegionContainerpane */ public void resetCenterRegionContainerPane() { - templateTabPane.add(MultiTemplateTabPane.getInstance(), BorderLayout.CENTER); + } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/ToolBarNewTemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/ToolBarNewTemplatePane.java deleted file mode 100644 index 64d58bd8e5..0000000000 --- a/designer-base/src/main/java/com/fr/design/mainframe/ToolBarNewTemplatePane.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.fr.design.mainframe; - -import com.fr.base.svg.IconUtils; -import com.fr.design.file.NewTemplatePane; - -import javax.swing.Icon; - -/** - * Created by hzzz on 2017/12/26. - */ -public class ToolBarNewTemplatePane extends NewTemplatePane { - - private static final ToolBarNewTemplatePane instance = new ToolBarNewTemplatePane(); - - private ToolBarNewTemplatePane() { - } - - public static NewTemplatePane getInstance() { - return instance; - } - - @Override - public Icon getNew() { - return IconUtils.readIcon("/com/fr/design/standard/addicon/addicon"); - } - - @Override - public Icon getMouseOverNew() { - return IconUtils.readIcon("/com/fr/design/standard/addicon/add_press.svg"); - } - - @Override - public Icon getMousePressNew() { - return IconUtils.readIcon("/com/fr/design/standard/addicon/add_press.svg"); - } -} 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 c147ccc4f7..b15e7f9ed6 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 @@ -45,7 +45,6 @@ import com.fr.design.actions.server.PlatformManagerAction; import com.fr.design.actions.server.PluginManagerAction; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.file.HistoryTemplateListCache; -import com.fr.design.file.NewTemplatePane; import com.fr.design.fun.MenuHandler; import com.fr.design.fun.OemProcessor; import com.fr.design.fun.PluginManagerProvider; @@ -59,7 +58,6 @@ import com.fr.design.gui.imenu.UIMenuBar; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.locale.impl.SupportLocaleImpl; import com.fr.design.mainframe.JTemplate; -import com.fr.design.mainframe.ToolBarNewTemplatePane; import com.fr.design.mainframe.platform.ServicePlatformAction; import com.fr.design.menu.MenuDef; import com.fr.design.menu.SeparatorDef; @@ -782,10 +780,6 @@ public abstract class ToolBarMenuDock { } - public NewTemplatePane getNewTemplatePane() { - return ToolBarNewTemplatePane.getInstance(); - } - protected void insertMenu(MenuDef menuDef, String anchor) { insertMenu(menuDef, anchor, new NoTargetAction()); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionsPanel.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionsPanel.java index 4dd14bce6d..f97ec6803c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionsPanel.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionsPanel.java @@ -13,7 +13,6 @@ import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrameFileDealerPane; import com.fr.design.mainframe.JTemplate; -import com.fr.design.mainframe.ToolBarNewTemplatePane; import com.fr.design.mainframe.WestRegionContainerPane; import com.fr.design.mainframe.vcs.common.VcsHelper; import com.fr.design.menu.ToolBarDef; @@ -156,7 +155,7 @@ public class FileVersionsPanel extends BasicPane { DesignModeContext.switchTo(isExit ? DesignerMode.NORMAL : DesignerMode.VCS); // MutilTempalteTabPane & NewTemplatePane 是否可点 - ToolBarNewTemplatePane.getInstance().setButtonGray(!isExit); + MultiTemplateTabPane.getInstance().setLeadingActionEnable(!isExit); JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); if (currentEditingTemplate.isJWorkBook()) { diff --git a/designer-base/src/main/java/com/fr/start/BaseDesigner.java b/designer-base/src/main/java/com/fr/start/BaseDesigner.java index 44228c2a4a..0391b4dabc 100644 --- a/designer-base/src/main/java/com/fr/start/BaseDesigner.java +++ b/designer-base/src/main/java/com/fr/start/BaseDesigner.java @@ -147,47 +147,47 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } } } - + @Nullable private FILE getLastOpenFile() { - + FILE file = DesignerStartupContext.getInstance().getStartingTemplateFile(); if (file == null) { file = FILEFactory.createFILE(FILEFactory.ENV_PREFIX + DesignerEnvManager.getEnvManager().getLastOpenFile()); } return file; } - + private boolean openFile(final DesignerFrame df, boolean isException, FILE file) { - + AtomicBoolean isExWrapper = new AtomicBoolean(isException); openTemplate(df, isExWrapper, file); - + if (OperatingSystem.isMacOS()) { enableFullScreenMode(df); } - + JTemplate selectedJTemplate = df.getSelectedJTemplate(); if (selectedJTemplate != null) { selectedJTemplate.requestGridFocus(); } return isExWrapper.get(); } - + private void openTemplate(DesignerFrame df, AtomicBoolean isException, FILE file) { - + // 如果是起始页启动中 if (openTemplateOnStartup(df, isException, file)) { return; } - + openTemplate0(df, isException, file); } - + private void openTemplate0(DesignerFrame df, AtomicBoolean isException, FILE file) { - + file = getExtraFILE(isException, file); - + if (file != null && file.exists() && !isException.get()) { df.openTemplate(file); } else { @@ -196,9 +196,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock { MultiTemplateTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); } } - + private FILE getExtraFILE(AtomicBoolean isException, FILE file) { - + //启动时打开指定文件的接口 DesignerStartOpenFileProcessor processor = ExtraDesignClassManager.getInstance().getSingle(DesignerStartOpenFileProcessor.XML_TAG); // 如果插件没有，且又开启了启动时打开空文件，则使用启动时打开空文件 @@ -216,9 +216,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } return file; } - + private boolean openTemplateOnStartup(DesignerFrame df, AtomicBoolean isException, FILE file) { - + boolean onStartup = DesignerStartupContext.getInstance().isSupport(); if (onStartup) { DesignerStartupContext context = DesignerStartupContext.getInstance(); @@ -234,29 +234,30 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } return false; } - + private boolean isOpenTemplate(AtomicBoolean isException, FILE file, DesignerStartupContext context) { - + return context.isOpenLastFile() && file != null && file.exists() && !isException.get(); } - + private boolean openEmpty(DesignerFrame df) { df.showEmptyJTemplate(); return true; } - + private boolean openTemplate(DesignerFrame df, FILE file) { df.openTemplate(file); return true; } - + private boolean createNewTemplate(DesignerFrame df) { df.addAndActivateJTemplate(); // 如果没有模板，则需要确认一下 - MultiTemplateTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); + MultiTemplateTabPane.getInstance() + .setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); return true; } - + private void enableFullScreenMode(Window window) { String className = "com.apple.eawt.FullScreenUtilities"; String methodName = "setWindowCanFullScreen"; diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more_hover.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more_hover.svg new file mode 100644 index 0000000000..5ffca66be2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more_hover.svg @@ -0,0 +1,4 @@ + + + + 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 fadbdfd33f..48e06977bd 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 @@ -1234,6 +1234,9 @@ CellOtherSetPane.height=$Component.defaultHeight [style]Button.inToolbarRight = \ margin : 0,0,0,0 +[style]Button.tabAction = \ + toolbar.margin : 5,11,5,11 + [style]ToolBar.topTools = \ background: #fff