Browse Source

Pull request #6758: REPORT-62972 【接触点优化】跟组件可更新的交互提示问题 & REPORT-62984 设计器触摸板问题-双指向右滑动时,设计器界面同时向右下滑动

Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x

* commit 'f4ce22e862bc2dc0fe091337187d8782919057fb':
  REPORT-62984 设计器触摸板问题-双指向右滑动时,设计器界面同时向右下滑动
  REPORT-62972 【接触点优化】跟组件可更新的交互提示问题
feature/x
starryi 3 years ago
parent
commit
675635f437
  1. 1
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/LocalWidgetRepoPane.java
  2. 7
      designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java

1
designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/LocalWidgetRepoPane.java

@ -92,6 +92,7 @@ public class LocalWidgetRepoPane extends BasicPane {
container.setLayout(new BorderLayout());
updateTipPane = createUpdateTipPane();
updateTipPane.setVisible(false);
container.add(updateTipPane, BorderLayout.NORTH);
updateProgressPane = createUpdateMaskPane();

7
designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java

@ -879,12 +879,7 @@ public class GridMouseAdapter implements MouseListener, MouseWheelListener, Mous
* @param e
*/
public void mouseWheelMoved(MouseWheelEvent e) {
if (!InputEventBaseOnOS.isControlDown(e)) {
ElementCasePane reportPane = grid.getElementCasePane();
if (reportPane.isHorizontalScrollBarVisible()) {
reportPane.getVerticalScrollBar().setValue(reportPane.getVerticalScrollBar().getValue() + e.getWheelRotation() * 3);
}
}
}
/**

Loading…
Cancel
Save