Skip to content

fix(widgets): fix paintWidget ignore keys alt, control and shift #2140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix(widgets): fix paintWidget ignore keys alt, control and shift #2140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ff9dd0
fix(widgets): fix paintWidget ignore keys alt, control and shift
Oct 25, 2021
5a7f1ba
fix(widgets): Remove comment in paintWidget
Oct 27, 2021
593c7f3
Merge branch 'master' into paintWidget_IgnoreKey
luaceseb Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Sources/Widgets/Widgets3D/PaintWidget/behavior.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,21 @@ import macro from 'vtk.js/Sources/macros';
import { vec3 } from 'gl-matrix';

export default function widgetBehavior(publicAPI, model) {
// --------------------------------------------------------------------------
// Interactor events
// --------------------------------------------------------------------------

function ignoreKey(e) {
return e.altKey || e.controlKey || e.shiftKey;
}

publicAPI.handleLeftButtonPress = (callData) => {
if (!model.activeState || !model.activeState.getActive()) {
// if (!model.activeState || !model.activeState.getActive()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this comment.

if (
!model.activeState ||
!model.activeState.getActive() ||
ignoreKey(callData)
) {
return macro.VOID;
}

Expand Down
11 changes: 10 additions & 1 deletion Sources/Widgets/Widgets3D/ShapeWidget/behavior.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,14 @@ export default function widgetBehavior(publicAPI, model) {
return model.hasFocus ? macro.EVENT_ABORT : macro.VOID;
};

// --------------------------------------------------------------------------
// Interactor events
// --------------------------------------------------------------------------

function ignoreKey(e) {
return e.altKey || e.controlKey || e.shiftKey;
}

// --------------------------------------------------------------------------
// Left click: Add point / End interaction
// --------------------------------------------------------------------------
Expand All @@ -514,7 +522,8 @@ export default function widgetBehavior(publicAPI, model) {
if (
!model.activeState ||
!model.activeState.getActive() ||
!model.pickable
!model.pickable ||
ignoreKey(e)
) {
return macro.VOID;
}
Expand Down
14 changes: 12 additions & 2 deletions Sources/Widgets/Widgets3D/SplineWidget/behavior.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,14 @@ export default function widgetBehavior(publicAPI, model) {
model.firstHandle = null;
};

// --------------------------------------------------------------------------
// Interactor events
// --------------------------------------------------------------------------

function ignoreKey(e) {
return e.altKey || e.controlKey || e.shiftKey;
}

// --------------------------------------------------------------------------
// Right click: Delete handle
// --------------------------------------------------------------------------
Expand All @@ -144,7 +152,8 @@ export default function widgetBehavior(publicAPI, model) {
if (
!model.activeState ||
!model.activeState.getActive() ||
!model.pickable
!model.pickable ||
ignoreKey(e)
) {
return macro.VOID;
}
Expand Down Expand Up @@ -179,7 +188,8 @@ export default function widgetBehavior(publicAPI, model) {
if (
!model.activeState ||
!model.activeState.getActive() ||
!model.pickable
!model.pickable ||
ignoreKey(e)
) {
return macro.VOID;
}
Expand Down