BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 17:22:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

move mouse scroll logic to RulerScrollPane

Browse Source
This commit is contained in:
Branislav Stojkovic
2019-01-15 23:57:25 +01:00
parent 984edc196b
commit 81a6cf282b
3 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-swing/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/lib/swing-framework.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
+5 -24
View File
@@ -17,7 +17,6 @@
*/ */
package org.diylc.swing.plugins.canvas; package org.diylc.swing.plugins.canvas;
import java.awt.Cursor;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Point; import java.awt.Point;
import java.awt.Rectangle; import java.awt.Rectangle;
@@ -108,10 +107,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
private double zoomLevel = 1; private double zoomLevel = 1;
// mouse scroll mode
private boolean mouseScrollMode = false;
private Point mouseScrollPrevLocation = null;
private static double MOUSE_SCROLL_SPEED = 0.8;
public CanvasPlugin(ISwingUI swingUI) { public CanvasPlugin(ISwingUI swingUI) {
this.swingUI = swingUI; this.swingUI = swingUI;
@@ -147,18 +143,11 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
if (!mouseScrollMode && e.getButton() == MouseEvent.BUTTON2) { if (scrollPane.isMouseScrollMode() || e.getButton() == MouseEvent.BUTTON2)
mouseScrollPrevLocation = null; return;
mouseScrollMode = true;
canvasPanel.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
} else if (mouseScrollMode) {
mouseScrollMode = false;
canvasPanel.setCursor(plugInPort.getCursorAt(e.getPoint()));
} else {
plugInPort.mouseClicked(e.getPoint(), e.getButton(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(), e.isAltDown(), plugInPort.mouseClicked(e.getPoint(), e.getButton(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(), e.isAltDown(),
e.getClickCount()); e.getClickCount());
} }
}
@Override @Override
public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e) {
@@ -225,19 +214,11 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
@Override @Override
public void mouseMoved(MouseEvent e) { public void mouseMoved(MouseEvent e) {
if (mouseScrollMode) { if (scrollPane.isMouseScrollMode())
if (mouseScrollPrevLocation != null) { return;
int dx = (int) ((e.getPoint().x - mouseScrollPrevLocation.x) * MOUSE_SCROLL_SPEED);
int dy = (int) ((e.getPoint().y - mouseScrollPrevLocation.y) * MOUSE_SCROLL_SPEED);
scrollPane.getHorizontalScrollBar().setValue(scrollPane.getHorizontalScrollBar().getValue() + dx);
scrollPane.getVerticalScrollBar().setValue(scrollPane.getVerticalScrollBar().getValue() + dy);
}
mouseScrollPrevLocation = e.getPoint();
} else {
canvasPanel.setCursor(plugInPort.getCursorAt(e.getPoint())); canvasPanel.setCursor(plugInPort.getCursorAt(e.getPoint()));
plugInPort.mouseMoved(e.getPoint(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(), e.isAltDown()); plugInPort.mouseMoved(e.getPoint(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(), e.isAltDown());
} }
}
}); });
} }
return canvasPanel; return canvasPanel;