Pull request #3067: REPORT-44714 【10.0.12冒烟】设计器缓存文件记录设计器设置失效

Merge in DESIGN/design from ~YVAN/design:final/10.0 to final/10.0

* commit '8a55c41846fbc8d2d666b638da62ec3217f93107':
  REPORT-44714 【10.0.12冒烟】设计器缓存文件记录设计器设置失效 【问题原因】需要在中间版本发布，提一份到final 【改动思路】改动已经在release中通过，提一份到final

designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java

@@ -45,6 +45,7 @@ public class UIResizableContainer extends JPanel {
     private boolean isLeftRightDragEnabled = true;
     private boolean isDownPaneVisible = true ;
     private int paraHeight;
+    private int parentHeight = -1;
 
     public UIResizableContainer(int direction) {
         this(new JPanel(), new JPanel(), direction);
@@ -207,7 +208,8 @@ public class UIResizableContainer extends JPanel {
             if (verticalToolPane == null || downPane == null) {
                 return;
             }
-
+            // REPORT-42913 如果用户修改了分辨率或者dpi，可能造成toolPaneY大于parent.getHeight，整个downPane将丢失，因此这里调整下toolPaneY
+            adjustToolPaneY(parent);
             if (direction == Constants.RIGHT) {
                 if(isDownPaneVisible){
                     upPane.setBounds(0, 0, containerWidth - toolPaneHeight, toolPaneY);
@@ -236,6 +238,18 @@ public class UIResizableContainer extends JPanel {
             }
         }
 
+        private void adjustToolPaneY(Container parent) {
+            if (parentHeight == -1) {
+                // 初始化下parentheight，存一下当前的父容器height
+                parentHeight = parent.getHeight();
+            }
+            if (parentHeight != parent.getHeight() && (parent.getHeight() - toolPaneHeight) >= 0) {
+                // 调整toolPaneY，保证至少水平的拖拽条horizontToolPane不丢失
+                toolPaneY = Math.min(toolPaneY, parent.getHeight() - toolPaneHeight);
+                parentHeight = parent.getHeight();
+            }
+        }
+
         @Override
         public void addLayoutComponent(String name, Component comp) {
         }
@@ -540,4 +554,4 @@ public class UIResizableContainer extends JPanel {
         jf.setSize(500, 500);
         jf.setVisible(true);
     }
-}
+}