Skip to content

Support CSS Scaling #207

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

Merged
merged 4 commits into from
Mar 26, 2025
Merged

Support CSS Scaling #207

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d92351e
support css scaling
caizoryan Feb 21, 2025
6cf80d6
simplify scale support
nightwing Mar 26, 2025
4b9e1a0
fix cursor taking color of previous character
nightwing Mar 26, 2025
d8e1328
Update src/block-cursor.ts
nightwing Mar 26, 2025
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
18 changes: 12 additions & 6 deletions src/block-cursor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class BlockCursorPlugin {
this.cursorLayer.className = "cm-cursorLayer cm-vimCursorLayer"
this.cursorLayer.setAttribute("aria-hidden", "true")
view.requestMeasure(this.measureReq)
this.setBlinkRate()
this.setBlinkRate()
}

setBlinkRate() {
Expand All @@ -78,11 +78,11 @@ export class BlockCursorPlugin {
}

update(update: ViewUpdate) {
if (update.selectionSet || update.geometryChanged || update.viewportChanged) {
if (update.selectionSet || update.geometryChanged || update.viewportChanged) {
this.view.requestMeasure(this.measureReq)
this.cursorLayer.style.animationName = this.cursorLayer.style.animationName == "cm-blink" ? "cm-blink2" : "cm-blink"
}
if (configChanged(update)) this.setBlinkRate();
}
if (configChanged(update)) this.setBlinkRate();
}

scheduleRedraw() {
Expand Down Expand Up @@ -146,7 +146,7 @@ export const hideNativeSelection = Prec.highest(EditorView.theme(themeSpec))
function getBase(view: EditorView) {
let rect = view.scrollDOM.getBoundingClientRect()
let left = view.textDirection == Direction.LTR ? rect.left : rect.right - view.scrollDOM.clientWidth
return {left: left - view.scrollDOM.scrollLeft, top: rect.top - view.scrollDOM.scrollTop}
return {left: left - view.scrollDOM.scrollLeft * view.scaleX, top: rect.top - view.scrollDOM.scrollTop * view.scaleY}
}

function measureCursor(cm: CodeMirror, view: EditorView, cursor: SelectionRange, primary: boolean): Piece | null {
Expand Down Expand Up @@ -179,6 +179,12 @@ function measureCursor(cm: CodeMirror, view: EditorView, cursor: SelectionRange,
let base = getBase(view);
let domAtPos = view.domAtPos(head);
let node = domAtPos ? domAtPos.node : view.contentDOM;
if (node instanceof Text && domAtPos.offset >= node.data.length) {
if (node.parentElement?.nextSibling) {
node = node.parentElement?.nextSibling;
domAtPos = {node: node, offset: 0};
};
}
while (domAtPos && domAtPos.node instanceof HTMLElement) {
node = domAtPos.node;
domAtPos = {node: domAtPos.node.childNodes[domAtPos.offset], offset: 0};
Expand Down Expand Up @@ -207,7 +213,7 @@ function measureCursor(cm: CodeMirror, view: EditorView, cursor: SelectionRange,
letter += view.state.sliceDoc(head + 1, head + 2);
}
let h = (pos.bottom - pos.top);
return new Piece(left - base.left, pos.top - base.top + h * (1 - hCoeff), h * hCoeff,
return new Piece((left - base.left)/view.scaleX, (pos.top - base.top + h * (1 - hCoeff))/view.scaleY, h * hCoeff/view.scaleY,
style.fontFamily, style.fontSize, style.fontWeight, style.color,
primary ? "cm-fat-cursor cm-cursor-primary" : "cm-fat-cursor cm-cursor-secondary",
letter, hCoeff != 1)
Expand Down