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

standardize ctrl to command on mac

Browse Source
This commit is contained in:
bancika
2017-04-21 17:19:17 +02:00
parent aad6cef831
commit d1b29ec228
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
+5 -5
View File
@@ -169,7 +169,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
@Override @Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
if (plugInPort.keyPressed(e.getKeyCode(), e.isControlDown(), e.isShiftDown(), e.isAltDown())) { if (plugInPort.keyPressed(e.getKeyCode(), e.isControlDown() || e.isMetaDown(), e.isShiftDown(), e.isAltDown())) {
e.consume(); e.consume();
} }
} }
@@ -180,7 +180,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
@Override @Override
public void mouseMoved(MouseEvent e) { public void mouseMoved(MouseEvent e) {
canvasPanel.setCursor(plugInPort.getCursorAt(e.getPoint())); canvasPanel.setCursor(plugInPort.getCursorAt(e.getPoint()));
plugInPort.mouseMoved(e.getPoint(), e.isControlDown(), e.isShiftDown(), e.isAltDown()); plugInPort.mouseMoved(e.getPoint(), e.isControlDown() || e.isMetaDown(), e.isShiftDown(), e.isAltDown());
} }
}); });
@@ -188,8 +188,8 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
plugInPort.mouseClicked(e.getPoint(), e.getButton(), e.isControlDown(), e.isShiftDown(), e.isAltDown(), plugInPort.mouseClicked(e.getPoint(), e.getButton(), e.isControlDown() || e.isMetaDown(), e.isShiftDown(),
e.getClickCount()); e.isAltDown(), e.getClickCount());
} }
}); });
} }
@@ -218,7 +218,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
public void mouseWheelMoved(MouseWheelEvent e) { public void mouseWheelMoved(MouseWheelEvent e) {
boolean wheelZoom = ConfigurationManager.getInstance().readBoolean(IPlugInPort.WHEEL_ZOOM_KEY, false); boolean wheelZoom = ConfigurationManager.getInstance().readBoolean(IPlugInPort.WHEEL_ZOOM_KEY, false);
if (wheelZoom || e.isControlDown()) { if (wheelZoom || e.isControlDown() || e.isMetaDown()) {
// disable scrolling // disable scrolling
scrollPane.setWheelScrollingEnabled(false); scrollPane.setWheelScrollingEnabled(false);
diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
+2 -2
View File
@@ -68,7 +68,7 @@ public class ComponentButtonFactory {
} }
} }
// Ctrl appends selection // Ctrl appends selection
if (e.isControlDown()) { if (e.isControlDown() || e.isMetaDown()) {
newSelection.addAll(plugInPort.getSelectedComponents()); newSelection.addAll(plugInPort.getSelectedComponents());
} }
plugInPort.updateSelection(newSelection); plugInPort.updateSelection(newSelection);
@@ -82,7 +82,7 @@ public class ComponentButtonFactory {
@Override @Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
plugInPort.keyPressed(e.getKeyCode(), e.isControlDown(), e.isShiftDown(), e.isAltDown()); plugInPort.keyPressed(e.getKeyCode(), e.isControlDown() || e.isMetaDown(), e.isShiftDown(), e.isAltDown());
} }
}); });
return button; return button;