Browse Source

Pull request #15199: REPORT-138690 fix: 富文本编辑器工具条缺失元素补充

Merge in DESIGN/design from ~LEVY.XIE/design:fbp/master to fbp/master

* commit '9922b1e4d04de8b69ef116877834d65e9612d1e6':
  无jira 启动页视觉图换新
  无jira 启动页视觉图换新
  REPORT-138690 fix: 富文本编辑器工具条缺失元素补充
fbp/master
Levy.Xie-解安森 1 month ago
parent
commit
5fe0288746
  1. 11
      designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java
  2. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash.png
  3. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x.png
  4. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x_en.png
  5. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh.png
  6. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh_TW.png
  7. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_en.png
  8. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_zh.png
  9. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_zh_TW.png

11
designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java

@ -108,7 +108,7 @@ public class RichTextToolBar extends BasicPane {
fontNameComboBox = new UIComboBox(DesignUtils.getAvailableFontFamilyNames4Report());
fontSizeComboBox = new UIComboBox(FRFontPane.getFontSizes());
colorSelectPane = new UIToolbarColorButton(new LazyIcon("foreground"));
colorSelectPane.set4Toolbar();
setColorSelectPaneStyle();
bold = new UIToggleButton(new LazyIcon("bold"));
italic = new UIToggleButton(new LazyIcon("italic"));
@ -127,10 +127,19 @@ public class RichTextToolBar extends BasicPane {
bindListener();
}
private void setColorSelectPaneStyle() {
colorSelectPane.set4Toolbar();
if (colorSelectPane.getLeftButton() != null && colorSelectPane.getRightButton() != null) {
colorSelectPane.getLeftButton().setBackground(null);
colorSelectPane.getRightButton().setBackground(null);
}
}
private void addIntoToolBar() {
toolbar.add(bold);
toolbar.add(italic);
toolbar.add(underline);
toolbar.add(colorSelectPane);
toolbar.add(subPane);
toolbar.add(superPane);
toolbar.add(formulaPane);

BIN
designer-realize/src/main/resources/com/fr/design/images/splash.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 KiB

After

Width:  |  Height:  |  Size: 252 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 870 KiB

After

Width:  |  Height:  |  Size: 869 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x_en.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 870 KiB

After

Width:  |  Height:  |  Size: 869 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 870 KiB

After

Width:  |  Height:  |  Size: 868 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh_TW.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 870 KiB

After

Width:  |  Height:  |  Size: 868 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash_en.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 KiB

After

Width:  |  Height:  |  Size: 252 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash_zh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 KiB

After

Width:  |  Height:  |  Size: 252 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash_zh_TW.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 KiB

After

Width:  |  Height:  |  Size: 252 KiB

Loading…
Cancel
Save