From 9b707786c6b278f3ebf686c56b0cb8a20f9f1aa5 Mon Sep 17 00:00:00 2001
From: Johannes Eder <eder@fortiss.org>
Date: Thu, 26 Mar 2020 16:37:03 +0100
Subject: [PATCH] changed multi select to ctrl+left click
Issue-Ref: 3967
Issue-Url: https://af3-developer.fortiss.org/issues/3967
Signed-off-by: Johannes Eder <eder@fortiss.org>
---
.../tooling/common/ui/javafx/lwfxef/DiagramViewer.java | 4 ++--
.../tooling/common/ui/javafx/lwfxef/MVCBundleManager.java | 2 +-
.../ui/javafx/lwfxef/controller/base/ControllerBase.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/DiagramViewer.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/DiagramViewer.java
index a96338d3d..82a70a1bb 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/DiagramViewer.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/DiagramViewer.java
@@ -377,8 +377,8 @@ public class DiagramViewer {
}
/** Interprets the effect of shift-clicking the given {@link IMVCBundle}. */
- public void handleShiftSelectionOf(IMVCBundle sel) {
- viewerManager.handleShiftSelectionOf(sel);
+ public void handleCtrlSelectionOf(IMVCBundle sel) {
+ viewerManager.handleCtrlSelectionOf(sel);
}
/**
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/MVCBundleManager.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/MVCBundleManager.java
index 2b4ab114c..e4892a571 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/MVCBundleManager.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/MVCBundleManager.java
@@ -605,7 +605,7 @@ import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.IVisualFactory;
}
/** Performs shift selection of the given bundle. */
- public void handleShiftSelectionOf(IMVCBundle sel) {
+ public void handleCtrlSelectionOf(IMVCBundle sel) {
if(primarySelectedBundle == sel || secondarySelectedBundles.contains(sel)) {
removeSelectedMVCBundle(sel);
} else {
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/ControllerBase.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/ControllerBase.java
index 0ab6cf1b3..0d262e742 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/ControllerBase.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/ControllerBase.java
@@ -75,8 +75,8 @@ public abstract class ControllerBase extends MVCBundlePartBase implements IContr
if(!selectOnClick()) {
return null;
}
- if(event.isShiftDown()) {
- getViewer().handleShiftSelectionOf(getMVCBundle());
+ if(event.isControlDown()) {
+ getViewer().handleCtrlSelectionOf(getMVCBundle());
} else {
getViewer().setSingleSelectedMVCBundle(getMVCBundle());
}
--
GitLab