From 8a1c5c2eb56263c332916c835afac246ce80397b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?=
<Levy.Xie@fanruan.com>
Date: Fri, 6 Sep 2024 19:36:57 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-132393=20&=20REPORT-133561=20fix?=
=?UTF-8?q?=EF=BC=9ANewUI=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E6=A0=87=E9=97=AE?=
=?UTF-8?q?=E9=A2=98&=E5=9B=BE=E8=A1=A8=E5=8C=BA=E5=9F=9F=E9=81=97?=
=?UTF-8?q?=E6=BC=8F=E7=BF=BB=E6=96=B0=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../design/cell/editor/BiasTextPainterCellEditor.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java b/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java
index 1a578638c8..57f29e2c71 100644
--- a/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java
+++ b/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java
@@ -4,8 +4,8 @@
package com.fr.design.cell.editor;
import com.fine.swing.ui.layout.Layouts;
-import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.utils.FineUIScale;
+import com.fr.design.border.FineBorderFactory;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.ibutton.UIRadioButton;
@@ -84,7 +84,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
Window parentWindow = SwingUtilities.getWindowAncestor(grid);
this.biasTextPainterPane = new BiasTextPainterPane();
- Dimension wrapDimension = FineUIScale.scale(new Dimension(360, 172));
+ Dimension wrapDimension = FineUIScale.scale(new Dimension(360, 212));
this.biasTextPainterPane.populate(biasTextPainter);
return this.biasTextPainterPane.showWindowWithCustomSize(parentWindow, new DialogActionAdapter() {
@@ -113,7 +113,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
formulaTextArea = new UITextArea();
JScrollPane scrollPane = new JScrollPane(formulaTextArea);
- scrollPane.setBorder(new FineRoundBorder());
+ scrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder());
formulaTextArea.setBorder(null);
String leftToLowerText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right");
@@ -130,8 +130,8 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
group.add(choice2);
add(Layouts.column(10,
- Layouts.cell(formulaLabel).weight(0.1), Layouts.cell(scrollPane).weight(0.12),
- Layouts.row(5, Layouts.cell(choice1).weight(1), Layouts.cell(choice2).weight(1)).weight(0.12)).getComponent());
+ Layouts.cell(formulaLabel), Layouts.cell(scrollPane).weight(1),
+ Layouts.row(5, Layouts.cell(choice1).weight(1), Layouts.cell(choice2).weight(1))).getComponent());
}
@Override