Browse Source

Pull request #15908: REPORT-144753 fix:东区特定面板滚动问题修复

Merge in DESIGN/design from ~RICHARD.FANG/design:fbp/release to fbp/release

* commit 'e455bcb09dc09672d8888a0dc7bd6bc3c112eef3':
  REPORT-144753 fix:东区特定面板滚动问题修复
fbp/release
Richard.Fang-方超 4 days ago
parent
commit
08b3c41a29
  1. 6
      designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java
  2. 9
      designer-chart/src/main/java/com/fr/van/chart/designer/AbstractVanChartScrollPane.java

6
designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java

@ -113,12 +113,12 @@ public abstract class BasicScrollPane<T> extends BasicBeanPane<T>{
} }
/** /**
* 插入图表后单元格元素使用cardLayout布局,需要滚动效果获取高度在子类中重新计算 * 插入图表后单元格元素使用cardLayout布局获取可视窗口高度用于判断面板是否需要滚动效果
* *
* @return height * @return 可见区域的高度
*/ */
protected int getMaxHeight(){ protected int getMaxHeight(){
return getHeight(); return getVisibleRect().height;
} }
protected class BarLayout implements LayoutManager { protected class BarLayout implements LayoutManager {

9
designer-chart/src/main/java/com/fr/van/chart/designer/AbstractVanChartScrollPane.java

@ -19,13 +19,4 @@ public abstract class AbstractVanChartScrollPane<T> extends BasicScrollPane<T> {
super.reloaPane(pane); super.reloaPane(pane);
leftcontentPane.setBorder(BorderFactory.createEmptyBorder()); leftcontentPane.setBorder(BorderFactory.createEmptyBorder());
} }
/**
* 获取可视窗口高度
* @return height
*/
@Override
protected int getMaxHeight() {
return getVisibleRect().height;
}
} }

Loading…
Cancel
Save