Skip to content
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

Jump to bottom

Fix helper line feedback matching #323

Merged
merged 1 commit into from Mar 8, 2024
Merged

Fix helper line feedback matching #323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/client/src/features/helper-lines/helper-line-feedback.ts
View file
Open in desktop
Expand Up @@ -64,6 +64,7 @@ import {
isVisibleOnCanvas
} from '../../utils/gmodel-util';
import { getViewportBounds, toAbsoluteBounds } from '../../utils/viewpoint-util';
import { feedbackEdgeEndId, feedbackEdgeId } from '../tools';
import { HelperLine, HelperLineType, SelectionBounds, isHelperLine, isSelectionBounds } from './model';

export type ViewportLineType = typeof HelperLineType.Center | typeof HelperLineType.Middle | string;
Expand All @@ -90,7 +91,12 @@ export const DEFAULT_ELEMENT_LINES = ALL_ELEMENT_LINE_TYPES;
export const DEFAULT_VIEWPORT_LINES = ALL_VIEWPORT_LINE_TYPES;
export const DEFAULT_EPSILON = 1;
export const DEFAULT_ALIGNABLE_ELEMENT_FILTER = (element: BoundsAwareModelElement): boolean =>
isVisibleOnCanvas(element) && !isRoutable(element) && !(element instanceof GLabel) && !isDecoration(element);
isVisibleOnCanvas(element) &&
!isRoutable(element) &&
!(element instanceof GLabel) &&
!(element.id === feedbackEdgeId(element.root)) &&
!(element.id === feedbackEdgeEndId(element.root)) &&
!isDecoration(element);
export const DEFAULT_DEBUG = false;

export namespace DrawHelperLinesFeedbackAction {
Expand Down Expand Up @@ -294,7 +300,7 @@ export class DrawHelperLinesFeedbackCommand extends FeedbackCommand {
}

protected isMatch(leftCoordinate: number, rightCoordinate: number, epsilon: number): boolean {
return Math.abs(leftCoordinate - rightCoordinate) < epsilon;
return Math.abs(leftCoordinate - rightCoordinate) <= epsilon;
}

protected log(message: string, ...params: any[]): void {
Expand Down