Browse Source

Pull request #15072: REPORT-137267 【fr-fbp回归】预定义控件如果多了,无法在设计器参数面板显示全

Merge in DESIGN/design from ~RENEKTON/design:fbp/release to fbp/release

* commit '3816c1570cb9870fa739e5f6f22725feeda9e6b7':
  调整控件弹窗高度计算
fbp/merge
Renekton-张世豪 2 months ago
parent
commit
05631d59a0
  1. 6
      designer-form/src/main/java/com/fr/design/mainframe/FormWidgetPopWindow.java

6
designer-form/src/main/java/com/fr/design/mainframe/FormWidgetPopWindow.java

@ -17,6 +17,8 @@ import java.awt.Toolkit;
import java.awt.event.AWTEventListener;
import java.awt.event.MouseEvent;
import static com.fine.theme.utils.FineUIScale.scale;
//august:
public class FormWidgetPopWindow extends JWindow {
private WidgetOption[] options;
@ -127,8 +129,8 @@ public class FormWidgetPopWindow extends JWindow {
public Dimension preferredLayoutSize(Container parent) {
Insets insets = parent.getInsets();
int nmembers = parent.getComponentCount();
return new Dimension(maxLine * 28 + insets.left + insets.right + right + left, (nmembers / maxLine + 1)
* 24 + insets.top + insets.bottom + top + bottom);
return new Dimension(maxLine * scale(28) + insets.left + insets.right + scale(right) + scale(left),
(int) Math.ceil((float) nmembers / maxLine) * scale(26) + insets.top + insets.bottom + scale(top) + scale(bottom));
}
@Override

Loading…
Cancel
Save