Browse Source

REPORT-55492 【交互验收】【组件背景分离】macos中小工具栏的按钮区域浮到最上面来了(应该被dialog覆盖)

final/10.0
hades 3 years ago
parent
commit
888488b9e8
  1. 6
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  2. 5
      designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java

6
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@ -212,6 +212,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
} }
} }
@Override
public void windowIconified(WindowEvent e) {
// 最小化时 hide工具栏
HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTabChange();
}
}; };
private JComponent closeButton = new JComponent() { private JComponent closeButton = new JComponent() {

5
designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java

@ -3,8 +3,11 @@ package com.fr.design.designer.ui;
import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XCreator;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormDesigner;
import com.fr.stable.os.OperatingSystem;
import java.awt.Rectangle; import java.awt.Rectangle;
import javax.swing.JDialog; import javax.swing.JDialog;
import javax.swing.JFrame;
/** /**
* @author hades * @author hades
@ -23,7 +26,7 @@ public class SelectedPopupDialog extends JDialog {
private boolean canVisible = true; private boolean canVisible = true;
public SelectedPopupDialog(XCreator creator, FormDesigner designer) { public SelectedPopupDialog(XCreator creator, FormDesigner designer) {
super(DesignerContext.getDesignerFrame()); super(OperatingSystem.isMacos() ? new JFrame() : DesignerContext.getDesignerFrame());
this.setUndecorated(true); this.setUndecorated(true);
this.setModal(false); this.setModal(false);
this.setFocusableWindowState(false); this.setFocusableWindowState(false);

Loading…
Cancel
Save