Browse Source

Merge pull request #1204 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit '601ddd6ba37f345978910da477ae78ee7dd40ebf':
  REPORT-2897 9.0设计器修改 视觉验收->插入悬浮元素、超级链接弹窗选中状态时字体是白色
  REPORT-4452 [9.0一轮回归]字体设置中上标下标可以同时被选中
master
superman 7 years ago
parent
commit
7325abe76c
  1. 1
      designer_base/src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java
  2. 2
      designer_base/src/com/fr/design/gui/style/FRFontPane.java

1
designer_base/src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java

@ -95,6 +95,7 @@ public class UIMenuEastAttrItem extends JMenuItem {
fm.getAscent() - 1);
}
} else {
menuItem.setForeground(isArmed() ? Color.white : Color.black);
SwingUtilities2.drawStringUnderlineCharAt(menuItem, g, text,
-1, 0, textRect.y + fm.getAscent());
}

2
designer_base/src/com/fr/design/gui/style/FRFontPane.java

@ -180,6 +180,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
if (superPane.isSelected() && !isSuper) {
frFont = frFont.applySuperscript(true);
frFont = frFont.applySubscript(false);
this.subPane.setSelected(false);
} else if (!superPane.isSelected() && isSuper) {
frFont = frFont.applySuperscript(false);
}
@ -188,6 +189,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
if (subPane.isSelected() && !isSub) {
frFont = frFont.applySubscript(true);
frFont = frFont.applySuperscript(false);
this.superPane.setSelected(false);
} else if (!subPane.isSelected() && isSub) {
frFont = frFont.applySubscript(false);
}

Loading…
Cancel
Save