diff options
| author | dakkar <dakkar@thenautilus.net> | 2025-04-28 15:00:00 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2025-04-28 15:31:28 +0100 |
| commit | 4981e5ba36bf9286a7bb9ff1dc6a10d7e3855241 (patch) | |
| tree | 5b00e9f161a2db8f688de1a0dfd3f86fd988592e /packages/frontend/src/components/global/MkMfm.ts | |
| parent | fix null checks for background in UserEntityService.ts (diff) | |
| parent | merge: Merge stable into develop (!971) (diff) | |
| download | sharkey-4981e5ba36bf9286a7bb9ff1dc6a10d7e3855241.tar.gz sharkey-4981e5ba36bf9286a7bb9ff1dc6a10d7e3855241.tar.bz2 sharkey-4981e5ba36bf9286a7bb9ff1dc6a10d7e3855241.zip | |
Merge branch 'develop' into merge/2025-03-24
Diffstat (limited to 'packages/frontend/src/components/global/MkMfm.ts')
| -rw-r--r-- | packages/frontend/src/components/global/MkMfm.ts | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/frontend/src/components/global/MkMfm.ts b/packages/frontend/src/components/global/MkMfm.ts index 4db27a3c35..dea486e66d 100644 --- a/packages/frontend/src/components/global/MkMfm.ts +++ b/packages/frontend/src/components/global/MkMfm.ts @@ -22,6 +22,7 @@ import MkGoogle from '@/components/MkGoogle.vue'; import MkSparkle from '@/components/MkSparkle.vue'; import MkA from '@/components/global/MkA.vue'; import { prefer } from '@/preferences.js'; +import { clamp } from '@@/js/math.js'; function safeParseFloat(str: unknown): number | null { if (typeof str !== 'string' || str === '') return null; @@ -310,10 +311,10 @@ export default function MkMfm(props: MfmProps, { emit }: { emit: SetupContext<Mf style = ''; break; } - const x = Math.min(safeParseFloat(token.props.args.x) ?? 1, 5); - const y = Math.min(safeParseFloat(token.props.args.y) ?? 1, 5); + const x = clamp(safeParseFloat(token.props.args.x) ?? 1, -5, 5); + const y = clamp(safeParseFloat(token.props.args.y) ?? 1, -5, 5); style = `transform: scale(${x}, ${y});`; - scale = scale * Math.max(x, y); + scale = scale * Math.max(Math.abs(x), Math.abs(y)); break; } case 'fg': { |