From 281d36524db0ca84efe8f57c6fe03067e3cff7a6 Mon Sep 17 00:00:00 2001 From: Yvan Date: Wed, 6 Jan 2021 10:46:42 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-46353=20jdk8-=E6=8F=92=E5=85=A5=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E6=96=87=E6=9C=AC=E5=9B=BE=E6=A0=87=E5=8F=98=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E4=BA=86=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E3=80=91=E4=B9=8B=E5=89=8D=E7=9A=84=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=B3=BB=E7=BB=9Fscale=E7=9A=84=E6=96=B9=E6=B3=95=E6=9C=89?= =?UTF-8?q?=E7=82=B9=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF?= =?UTF-8?q?jdk8=EF=BC=8Cmac=E4=B8=8B=E4=BC=9A=E8=8E=B7=E5=8F=96=E5=88=B01.?= =?UTF-8?q?0=EF=BC=8C=E7=84=B6=E5=90=8E=E5=9B=BE=E6=A0=87=E5=B0=B1?= =?UTF-8?q?=E6=B2=A1=E6=9C=89jdk11=E4=B8=8B=E8=8E=B7=E5=8F=96=E6=88=902.0?= =?UTF-8?q?=E9=82=A3=E4=B9=88=E6=B8=85=E6=99=B0=20=E3=80=90=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E7=9B=B4=E6=8E=A5=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=B8=8B=E6=98=AF=E4=B8=8D=E6=98=AFretina=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E2.0=E7=9A=84scale=EF=BC=9B=E5=8F=A6=E5=A4=96?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E7=9A=84svg=E5=9B=BE=E7=89=87=E6=BC=8F=E4=BC=A0?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E4=B9=9F=E4=BC=A0=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/base/svg/SystemScaleUtils.java | 7 ++++++- .../com/fr/design/images/m_web/connection_normal.svg | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_web/connection_normal.svg diff --git a/designer-base/src/main/java/com/fr/base/svg/SystemScaleUtils.java b/designer-base/src/main/java/com/fr/base/svg/SystemScaleUtils.java index ee289b4c8a..4b79748065 100644 --- a/designer-base/src/main/java/com/fr/base/svg/SystemScaleUtils.java +++ b/designer-base/src/main/java/com/fr/base/svg/SystemScaleUtils.java @@ -1,5 +1,6 @@ package com.fr.base.svg; +import com.bulenkov.iconloader.util.UIUtil; import com.fr.log.FineLoggerFactory; import com.fr.stable.StableUtils; import com.fr.stable.os.OperatingSystem; @@ -77,6 +78,10 @@ public class SystemScaleUtils { * @return */ public static float sysScale() { + // 如果检测到是retina，直接返回2 + if (UIUtil.isRetina()) { + return 2.0f; + } float scale = 1.0f; // 先判断是否支持高清，不支持代表此时是Windows + jdk8 的设计器，返回的scale值为1.0 if (isJreHiDPIEnabled()) { @@ -86,7 +91,7 @@ public class SystemScaleUtils { // 获取图形配置对象 GraphicsConfiguration configuration = graphicsDevice.getDefaultConfiguration(); if (configuration != null && configuration.getDevice().getType() != GraphicsDevice.TYPE_PRINTER) { - // 获取屏幕缩放率，mac下固定为2，Windows+jdk11则将得到用户设置的dpi值 + // 获取屏幕缩放率，Windows+jdk11环境下会得到用户设置的dpi值 scale = (float) configuration.getDefaultTransform().getScaleX(); } } diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/connection_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_web/connection_normal.svg new file mode 100644 index 0000000000..7c865b45e0 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_web/connection_normal.svg @@ -0,0 +1,11 @@ + + + icon_定义数据连接_normal备份 + + + + + + + + \ No newline at end of file