Browse Source

Merge pull request #538 in BA/design from ~XIAOXIA/design:dev to dev

* commit '0c8f82acd31eb6b8dc59bf78d70d4caa3a72477d':
  低分辨率下的bug
master
superman 8 years ago
parent
commit
d71fb5fff1
  1. 5
      designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java

5
designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java

@ -3,7 +3,6 @@ package com.fr.design.gui.icontainer;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.EastRegionContainerPane;
import com.fr.stable.Constants; import com.fr.stable.Constants;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
@ -217,8 +216,8 @@ public class UIResizableContainer extends JPanel {
} }
} else if (direction == Constants.LEFT) { } else if (direction == Constants.LEFT) {
if(isDownPaneVisible){ if(isDownPaneVisible){
if (toolPaneY > getHeight() - toolPaneHeight) { if (toolPaneY > getHeight() - toolPaneHeight - getParameterPaneHeight()) {
toolPaneY = getHeight() - toolPaneHeight; toolPaneY = getHeight() - toolPaneHeight - getParameterPaneHeight();
} }
parameterPane.setBounds(20, 0, 230, getParameterPaneHeight()); parameterPane.setBounds(20, 0, 230, getParameterPaneHeight());
upPane.setBounds(toolPaneHeight, getParameterPaneHeight(), containerWidth - toolPaneHeight, toolPaneY); upPane.setBounds(toolPaneHeight, getParameterPaneHeight(), containerWidth - toolPaneHeight, toolPaneY);

Loading…
Cancel
Save