Browse Source

Merge pull request #370 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0

* commit '5a8669993d40efab2c2b0bb3e9fd9ef0b19285b0':
  REPORT-9518 启动动画界面偶尔字体显示异常
final/10.0
vito 6 years ago
parent
commit
74d0d4269e
  1. 20
      designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java

20
designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java

@ -30,8 +30,6 @@ import java.util.concurrent.CountDownLatch;
*/ */
public class SplashFxWindow extends Application { public class SplashFxWindow extends Application {
private static float JBUI_INIT_SCALE = JBUI.scale(1f);
private static final String ARIAL_FONT_NAME = "Arial"; private static final String ARIAL_FONT_NAME = "Arial";
private static final String PF_FONT_NAME = "PingFang"; private static final String PF_FONT_NAME = "PingFang";
private static final String YAHEI_FONT_NAME = "Microsoft YaHei"; private static final String YAHEI_FONT_NAME = "Microsoft YaHei";
@ -53,10 +51,6 @@ public class SplashFxWindow extends Application {
private FastGifImage image; private FastGifImage image;
private List<SplashFxActionListener> listeners = new ArrayList<SplashFxActionListener>(); private List<SplashFxActionListener> listeners = new ArrayList<SplashFxActionListener>();
private static int uiScale(int i) {
return (int) (i * JBUI_INIT_SCALE);
}
/** /**
* 获取当前运行实例黑科技 * 获取当前运行实例黑科技
* *
@ -94,23 +88,23 @@ public class SplashFxWindow extends Application {
AnchorPane.setRightAnchor(gif, 0d); AnchorPane.setRightAnchor(gif, 0d);
Font font; Font font;
if (OperatingSystem.isWindows()) { if (OperatingSystem.isWindows()) {
font = new Font(YAHEI_FONT_NAME, uiScale(FONT)); font = new Font(YAHEI_FONT_NAME, FONT);
} else if (OperatingSystem.isMacOS()) { } else if (OperatingSystem.isMacOS()) {
font = new Font(PF_FONT_NAME, uiScale(FONT)); font = new Font(PF_FONT_NAME, FONT);
} else { } else {
font = new Font(ARIAL_FONT_NAME, uiScale(FONT)); font = new Font(ARIAL_FONT_NAME, FONT);
} }
moduleInfo = new Text(); moduleInfo = new Text();
moduleInfo.setFont(font); moduleInfo.setFont(font);
moduleInfo.setFill(Color.WHITE); moduleInfo.setFill(Color.WHITE);
AnchorPane.setLeftAnchor(moduleInfo, (double) uiScale(MODULE_INFO_LEFT_MARGIN)); AnchorPane.setLeftAnchor(moduleInfo,(double) MODULE_INFO_LEFT_MARGIN);
AnchorPane.setBottomAnchor(moduleInfo, (double) uiScale(MODULE_INFO_BOTTOM_MARGIN)); AnchorPane.setBottomAnchor(moduleInfo,(double) MODULE_INFO_BOTTOM_MARGIN);
thanks = new Text(); thanks = new Text();
thanks.setFont(font); thanks.setFont(font);
thanks.setFill(Color.valueOf(THINKS_COLOR)); thanks.setFill(Color.valueOf(THINKS_COLOR));
AnchorPane.setRightAnchor(thanks, (double) uiScale(THINKS_BOTTOM_RIGHT)); AnchorPane.setRightAnchor(thanks, (double) THINKS_BOTTOM_RIGHT);
AnchorPane.setBottomAnchor(thanks, (double) uiScale(THINKS_BOTTOM_MARGIN)); AnchorPane.setBottomAnchor(thanks, (double) THINKS_BOTTOM_MARGIN);
root.getChildren().add(gif); root.getChildren().add(gif);
root.getChildren().add(moduleInfo); root.getChildren().add(moduleInfo);

Loading…
Cancel
Save