"Highlight Continuity Area" mode improvements

This commit is contained in:
bancika
2020-09-02 09:58:33 +02:00
parent 5591724a67
commit d7ea8f3738
9 changed files with 39 additions and 13 deletions
@@ -33,6 +33,7 @@ import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
import org.diylc.appframework.miscutils.ConfigurationManager;
import org.diylc.appframework.miscutils.PropertyInjector;
import org.diylc.common.IPlugInPort;
import org.diylc.core.IView;
import org.diylc.lang.LangUtil;
import org.diylc.presenter.Presenter;
@@ -82,6 +83,11 @@ public class DIYLCStarter {
ConfigurationManager.initialize("diylc");
// disable HIGHLIGHT_CONTINUITY_AREA config, keep it transient
ConfigurationManager.getInstance().writeValue(IPlugInPort.HIGHLIGHT_CONTINUITY_AREA, false);
LOG.info("Loading languages...");
LangUtil.configure();
LOG.debug("Java version: " + System.getProperty("java.runtime.version") + " by "
@@ -211,7 +211,8 @@ public class LoadlineEditorFrame extends JFrame implements IView {
@Override
public void mouseMoved(MouseEvent e) {
canvasPanel.setCursor(plugInPort.getCursorAt(e.getPoint()));
canvasPanel.setCursor(plugInPort.getCursorAt(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());
}
@@ -51,7 +51,7 @@ class CanvasGestureListener implements DragGestureListener {
forceReSelection = me.getButton() != MouseEvent.BUTTON1;
}
presenter.dragStarted(dge.getDragOrigin(), dge.getDragAction(), forceReSelection);
dge.startDrag(presenter.getCursorAt(dge.getDragOrigin()), new EmptyTransferable(), new CanvasSourceListener(
dge.startDrag(presenter.getCursorAt(dge.getDragOrigin(), false, false, false), new EmptyTransferable(), new CanvasSourceListener(
presenter));
}
}
@@ -311,12 +311,19 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
}
});
}
});
});
canvasPanel.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
canvasPanel.setCursor(plugInPort.getCursorAt(canvasPanel.getMousePosition(), false, false, false));
}
@Override
public void keyPressed(KeyEvent e) {
public void keyPressed(KeyEvent e) {
canvasPanel.setCursor(plugInPort.getCursorAt(canvasPanel.getMousePosition(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(),
e.isShiftDown(), e.isAltDown()));
if (plugInPort.keyPressed(e.getKeyCode(),
Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(), e.isAltDown())) {
e.consume();
@@ -330,7 +337,8 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
public void mouseMoved(MouseEvent e) {
if (scrollPane.isMouseScrollMode())
return;
canvasPanel.setCursor(plugInPort.getCursorAt(e.getPoint()));
canvasPanel.setCursor(plugInPort.getCursorAt(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());
}
@@ -76,7 +76,7 @@ class TreeGestureListener implements DragGestureListener {
}
if (start)
dge.startDrag(presenter.getCursorAt(dge.getDragOrigin()), new EmptyTransferable(),
dge.startDrag(presenter.getCursorAt(dge.getDragOrigin(), false, false, false), new EmptyTransferable(),
new TreeSourceListener(presenter));
}
}