erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-07 17:36:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

fix(web): constrains keytip within OSK bottom bound

Browse source
This commit is contained in:
Joshua A. Horton 2023-11-23 13:13:59 +07:00
parent 1c8e498b77
commit 8ede79285c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
web/src/engine/osk/src/input/gestures/browser/keytip.ts
View file

@ -4,7 +4,8 @@ import KeyTipInterface from '../../../keytip.interface.js';
import VisualKeyboard from '../../../visualKeyboard.js';
import { GesturePreviewHost } from '../../../keyboard-layout/gesturePreviewHost.js';
const DEFAULT_TIP_ORIENTATION = 'up';
// FIXME: should be 'up' in production.
const DEFAULT_TIP_ORIENTATION = 'down';
export default class KeyTip implements KeyTipInterface {
public readonly element: HTMLDivElement;
@ -175,7 +176,8 @@ export default class KeyTip implements KeyTipInterface {
this.cap.style.top = '';
this.cap.style.bottom = (halfHeight - capOffset) + 'px';
}
this.cap.style.height = (distFromTop - Math.floor(y) + canvasHeight - (orientation == 'up' ? halfHeight : -capOffset * 2)) + 'px'; //(halfHeight + 3 + ySubPixelPadding) + 'px';
const defaultCapHeight = (distFromTop - Math.floor(y) + canvasHeight - (orientation == 'up' ? halfHeight : -capOffset * 2));
this.cap.style.height = defaultCapHeight + 'px';
// let delta: number = 0;
if(this.constrain && tipHeight + bottomY > oskHeight) {
@ -183,6 +185,9 @@ export default class KeyTip implements KeyTipInterface {
kts.height = (canvasHeight-delta) + 'px';
const hx = Math.max(0, (canvasHeight-delta)-(canvasHeight/2) + 2);
this.cap.style.height = hx + 'px';
} else if(bottomY < 0) { // we'll assume that we always constrain at the OSK's bottom.
kts.bottom = '0px';
this.cap.style.height = (defaultCapHeight + bottomY) + 'px';
}
kts.display = 'block';