Browse Source

Merge pull request #5708 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '638e29e74265e3296ca9ef0f95429587bb06e0bf':
  REPORT-58713  加些注释
  REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
bugfix/10.0
superman 3 years ago
parent
commit
46b685fe67
  1. 9
      designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

9
designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

@ -802,7 +802,14 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
try { try {
popup.setLocation(designer.getLocationOnScreen().x + designer.getPaintX() + extraX, designer.getLocationOnScreen().y + designer.getPaintY() + extraY); popup.setLocation(designer.getLocationOnScreen().x + designer.getPaintX() + extraX, designer.getLocationOnScreen().y + designer.getPaintY() + extraY);
popup.updatePane(designer); popup.updatePane(designer);
popup.setVisible(selected && accept && popup.hasVisibleButtons() && popup.isCanVisible() && !isShowPluginDialog()); boolean needShowing = selected && accept && popup.hasVisibleButtons() && popup.isCanVisible() && !isShowPluginDialog();
// 当不可见时,且可以设置为可见状态,才去设置为可见
// 避免已经是可见状态时,重复设置可见,造成闪屏
if (!popup.isVisible() && needShowing) {
popup.setVisible(true);
} else if (!needShowing) {
popup.setVisible(false);
}
popup.setRelativeBounds(bounds); popup.setRelativeBounds(bounds);
} catch (Exception ignored) { } catch (Exception ignored) {
} }

Loading…
Cancel
Save