fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

REPORT-132393 & REPORT-133561 fix：NewUI 修复图标问题&图表区域遗漏翻新布局

fbp/release
Levy.Xie-解安森 3 months ago
parent
9fd187e150
commit
8a1c5c2eb5
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java

10
designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java
Unescape View File

@ -4,8 +4,8 @@
package com.fr.design.cell.editor; package com.fr.design.cell.editor;
import com.fine.swing.ui.layout.Layouts; import com.fine.swing.ui.layout.Layouts;
import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.utils.FineUIScale; import com.fine.theme.utils.FineUIScale;
import com.fr.design.border.FineBorderFactory;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ibutton.UIRadioButton;
@ -84,7 +84,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
Window parentWindow = SwingUtilities.getWindowAncestor(grid); Window parentWindow = SwingUtilities.getWindowAncestor(grid);
this.biasTextPainterPane = new BiasTextPainterPane(); this.biasTextPainterPane = new BiasTextPainterPane();
Dimension wrapDimension = FineUIScale.scale(new Dimension(360, 172)); Dimension wrapDimension = FineUIScale.scale(new Dimension(360, 212));
this.biasTextPainterPane.populate(biasTextPainter); this.biasTextPainterPane.populate(biasTextPainter);
return this.biasTextPainterPane.showWindowWithCustomSize(parentWindow, new DialogActionAdapter() { return this.biasTextPainterPane.showWindowWithCustomSize(parentWindow, new DialogActionAdapter() {
@ -113,7 +113,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
formulaTextArea = new UITextArea(); formulaTextArea = new UITextArea();
JScrollPane scrollPane = new JScrollPane(formulaTextArea); JScrollPane scrollPane = new JScrollPane(formulaTextArea);
scrollPane.setBorder(new FineRoundBorder()); scrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder());
formulaTextArea.setBorder(null); formulaTextArea.setBorder(null);
String leftToLowerText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right"); 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); group.add(choice2);
add(Layouts.column(10, add(Layouts.column(10,
Layouts.cell(formulaLabel).weight(0.1), Layouts.cell(scrollPane).weight(0.12), Layouts.cell(formulaLabel), Layouts.cell(scrollPane).weight(1),
Layouts.row(5, Layouts.cell(choice1).weight(1), Layouts.cell(choice2).weight(1)).weight(0.12)).getComponent()); Layouts.row(5, Layouts.cell(choice1).weight(1), Layouts.cell(choice2).weight(1))).getComponent());
} }
@Override @Override

Write Preview
Loading…
Cancel
Save