Browse Source

Merge pull request #1490 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'a5943c127935fe9ff4a72775dd8230739dde5b99':
  fix 调整
  fix 无用import
  fix 适配
  REPORT-28099
feature/big-screen
Hades 5 years ago
parent
commit
66c5665a66
  1. 7
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  2. 41
      designer-base/src/main/java/com/fr/design/os/impl/MacOsAddListenerAction.java
  3. 10
      designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java

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

@ -40,6 +40,7 @@ import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
import com.fr.design.mainframe.vcs.common.VcsHelper;
import com.fr.design.menu.MenuManager;
import com.fr.design.menu.ShortCut;
import com.fr.design.os.impl.MacOsAddListenerAction;
import com.fr.design.os.impl.SupportOSImpl;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.event.EventDispatcher;
@ -316,6 +317,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
// window close listener.
this.addWindowListeners(getFrameListeners());
addMacOsListener();
this.addComponentListener(new ComponentAdapter() {
@Override
@ -523,6 +526,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
}
}
private void addMacOsListener() {
OSSupportCenter.buildAction(new MacOsAddListenerAction(), SupportOSImpl.DOCK_QUIT);
}
protected ArrayList<WindowListener> getFrameListeners() {
ArrayList<WindowListener> arrayList = new ArrayList<>();

41
designer-base/src/main/java/com/fr/design/os/impl/MacOsAddListenerAction.java

@ -0,0 +1,41 @@
package com.fr.design.os.impl;
import com.fr.design.mainframe.DesignerFrame;
import com.fr.invoke.Reflect;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.os.support.OSBasedAction;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
/**
* @author hades
* @version 10.0
* Created by hades on 2020/3/13
*/
public class MacOsAddListenerAction implements OSBasedAction {
@Override
public void execute(final Object... objects) {
try {
Class app = Class.forName("com.apple.eawt.Application");
Class handler = Class.forName("com.apple.eawt.QuitHandler");
Object instance = Proxy.newProxyInstance(handler.getClassLoader(), new Class[]{handler},
new InvocationHandler() {
@Override
public Object invoke(Object proxy, Method method,
Object[] args) throws Throwable {
if ("handleQuitRequestWith".equals(method.getName())) {
DesignerFrame designerFrame = (DesignerFrame) objects[0];
designerFrame.exit();
}
return null;
}
});
Reflect.on(Reflect.on(app).call("getApplication").get()).call("setQuitHandler", instance);
} catch (ClassNotFoundException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
}
}

10
designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java

@ -73,6 +73,16 @@ public enum SupportOSImpl implements SupportOS {
public boolean support() {
return FRContext.isChineseEnv() && !OperatingSystem.isMacos() && Arch.getArch() != Arch.ARM;
}
},
/**
* mac下dock栏右键退出
*/
DOCK_QUIT {
@Override
public boolean support() {
return OperatingSystem.isMacos();
}
}
}

Loading…
Cancel
Save