Browse Source

Merge pull request #1335 in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0

* commit '28110a0d54c426b8f5a05833bbc5cbab7ade3f43':
  REPORT-19946 linux设计器
feature/big-screen
pengda 5 years ago
parent
commit
602375cab4
  1. 8
      designer-realize/src/main/java/com/fr/start/common/SplashWindow.java

8
designer-realize/src/main/java/com/fr/start/common/SplashWindow.java

@ -1,14 +1,12 @@
package com.fr.start.common; package com.fr.start.common;
import com.fr.base.BaseUtils;
import com.fr.design.fun.OemProcessor; import com.fr.design.fun.OemProcessor;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.IOUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.image4j.codec.ico.ICODecoder; import com.fr.stable.image4j.codec.ico.ICODecoder;
import com.fr.stable.os.OperatingSystem; import com.fr.stable.os.OperatingSystem;
import com.fr.start.OemHandler; import com.fr.start.OemHandler;
import com.sun.awt.AWTUtilities;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.image.*; import java.awt.image.*;
@ -41,8 +39,6 @@ public class SplashWindow extends JFrame {
this.setAlwaysOnTop(false); this.setAlwaysOnTop(false);
this.setUndecorated(true); this.setUndecorated(true);
AWTUtilities.setWindowOpaque(this, false);
//使窗体背景透明 //使窗体背景透明
if (OperatingSystem.isWindows()) { if (OperatingSystem.isWindows()) {
this.setBackground(new Color(0, 0, 0, 0)); this.setBackground(new Color(0, 0, 0, 0));
@ -73,7 +69,7 @@ public class SplashWindow extends JFrame {
this.setIconImages(image); this.setIconImages(image);
} catch (IOException e) { } catch (IOException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
this.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png")); this.setIconImage(IOUtils.readImage("/com/fr/base/images/oem/logo.png"));
} }
} }

Loading…
Cancel
Save