Browse Source

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

* commit '0e93d6b920781f8c4f4b4de10b1840f4819181a5':
  REPORT-28099 改进
feature/big-screen
Hades 5 years ago
parent
commit
bec189fb11
  1. 10
      designer-base/src/main/java/com/fr/design/os/impl/MacOsAddListenerAction.java

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

@ -1,6 +1,7 @@
package com.fr.design.os.impl; package com.fr.design.os.impl;
import com.fr.design.mainframe.DesignerFrame; import com.fr.design.mainframe.DesignerContext;
import com.fr.exit.DesignerExiter;
import com.fr.invoke.Reflect; import com.fr.invoke.Reflect;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.os.support.OSBasedAction; import com.fr.stable.os.support.OSBasedAction;
@ -27,8 +28,11 @@ public class MacOsAddListenerAction implements OSBasedAction {
public Object invoke(Object proxy, Method method, public Object invoke(Object proxy, Method method,
Object[] args) throws Throwable { Object[] args) throws Throwable {
if ("handleQuitRequestWith".equals(method.getName())) { if ("handleQuitRequestWith".equals(method.getName())) {
DesignerFrame designerFrame = (DesignerFrame) objects[0]; if (DesignerContext.getDesignerFrame() != null && DesignerContext.getDesignerFrame().isShowing()) {
designerFrame.exit(); DesignerContext.getDesignerFrame().exit();
} else {
DesignerExiter.getInstance().execute();
}
} }
return null; return null;
} }

Loading…
Cancel
Save