Skip to content

fix(playground): align selection handles with the scrolled score #2864

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
sgabenov wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(playground): align selection handles with the scrolled score #2864

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions packages/playground/src/apps/ControlApp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ export class ControlApp implements Mountable {
</div>
</div>
<div class="cmp-footer"></div>
<div class="cmp-selection-handles"></div>
</div>
`);

Expand All @@ -138,11 +137,8 @@ export class ControlApp implements Mountable {
'.cmp-footer',
new Footer(this.api, { trackList: this.sidebar.trackList })
);
this.selectionHandles = mount(
this.root,
'.cmp-selection-handles',
new SelectionHandles(this.api, viewport)
);
this.selectionHandles = new SelectionHandles(this.api, viewport, canvas);
canvas.appendChild(this.selectionHandles.root);
this.crosshair = new Crosshair();
this.dragDrop = new DragDrop(this.api, {
onEnter: () => this.overlay.enterDrag(),
Expand Down
14 changes: 10 additions & 4 deletions packages/playground/src/components/SelectionHandles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ export class SelectionHandles implements Mountable {

constructor(
private api: alphaTab.AlphaTabApi,
private viewportEl: HTMLElement
private viewportEl: HTMLElement,
private canvasEl: HTMLElement
) {
this.root = parseHtml(html`
<div class="at-selection-handles">
Expand Down Expand Up @@ -127,9 +128,14 @@ export class SelectionHandles implements Mountable {
}

private beatFromEvent(e: MouseEvent): alphaTab.model.Beat | undefined {
const rect = this.viewportEl.getBoundingClientRect();
const relX = e.clientX - rect.left;
const relY = e.clientY - rect.top;
const surface = this.canvasEl.querySelector<HTMLElement>('.at-surface');
if (!surface) {
return undefined;
}
// Bounds are relative to the score surface, not the scrolled viewport.
const rect = surface.getBoundingClientRect();
const relX = (e.clientX - rect.left) * (surface.offsetWidth / rect.width);
const relY = (e.clientY - rect.top) * (surface.offsetHeight / rect.height);
const beat = this.api.boundsLookup?.getBeatAtPos(relX, relY);
if (!beat) {
return undefined;
Expand Down