From 755a1dbbc1655f384ec51fe281f87496f3a76904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Fri, 20 Sep 2024 10:44:16 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-135143=20&=20REPORT-133294=20&=20REPORT-?= =?UTF-8?q?133394=20fix:NewUI=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java | 3 +++ .../src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java | 1 + .../resources/com/fine/theme/icon/font/background_disable.svg | 4 ++++ .../resources/com/fine/theme/icon/font/foreground_disable.svg | 4 ++++ .../com/fr/van/chart/column/VanChartColumnSeriesPane.java | 2 +- 5 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/font/background_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/font/foreground_disable.svg diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java index 4555096842..ea07516938 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java @@ -18,6 +18,7 @@ import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Insets; +import java.awt.RenderingHints; import java.awt.geom.AffineTransform; /** @@ -100,6 +101,8 @@ public class FineHeaderPaneUI extends PanelUI implements AnimatedPainter { + FineUIScale.scale(UIManager.getInt("ExpandablePane.HeaderPane.hGap")); float titleY = (headerPane.getHeight() - (ascent + descent)) / 2.0f + ascent; FlatUIUtils.setRenderingHints(g2d); + g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB); + g2d.drawString(headerPane.getTitle(), titleX, titleY); g2d.dispose(); } diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java index 715fd3e793..e6730126d8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java @@ -101,6 +101,7 @@ public class UIHeadGroup extends Row { b.setEnabled(h.isEnable()); b.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_TAB); b.addActionListener(e -> setSelectedIndex((int) index)); + b.setFocusPainted(false); }) ).toArray(Layouts.Cell[]::new); diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/background_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/background_disable.svg new file mode 100644 index 0000000000..3dff853cb9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/background_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/foreground_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/foreground_disable.svg new file mode 100644 index 0000000000..dcf70fdc59 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/foreground_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java index 7822cb3443..a8b039c77b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java @@ -79,7 +79,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { isFixedWidth.addActionListener(e -> checkColumnWidth()); isFillWithImage.addActionListener(e -> checkImagePane()); - return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Filled_With_Image"), borderPane, true); + return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), borderPane, true); } private void checkAll() {