From 7bb056d6a84ae6c60ac9ae736c173873215d8da8 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 7 Jun 2024 17:55:59 +0900 Subject: [PATCH] feat: lineheight --- src/lang/en.ts | 1 + src/lib/ChatScreens/Chat.svelte | 2 +- src/lib/Setting/Pages/DisplaySettings.svelte | 4 ++++ src/lib/UI/GUI/TextAreaResizable.svelte | 2 +- src/styles.css | 1 - src/ts/storage/database.ts | 2 ++ 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lang/en.ts b/src/lang/en.ts index 9d720913..63d9a255 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -652,4 +652,5 @@ export const languageEnglish = { applyModule: "Apply Module", successApplyModule: "Module is successfully applied", font: "Font", + lineHeight: "Line Height", } \ No newline at end of file diff --git a/src/lib/ChatScreens/Chat.svelte b/src/lib/ChatScreens/Chat.svelte index f67944ef..2bafe476 100644 --- a/src/lib/ChatScreens/Chat.svelte +++ b/src/lib/ChatScreens/Chat.svelte @@ -261,7 +261,7 @@ } }} style:font-size="{0.875 * ($DataBase.zoomsize / 100)}rem" - style:line-height="{1.25 * ($DataBase.zoomsize / 100)}rem" + style:line-height="{($DataBase.lineHeight ?? 1.25) * ($DataBase.zoomsize / 100)}rem" > {#key $CurrentVariablePointer} {#await markParsing(msgDisplay, character, 'normal', idx, translated)} diff --git a/src/lib/Setting/Pages/DisplaySettings.svelte b/src/lib/Setting/Pages/DisplaySettings.svelte index 77a5cad0..377e5542 100644 --- a/src/lib/Setting/Pages/DisplaySettings.svelte +++ b/src/lib/Setting/Pages/DisplaySettings.svelte @@ -153,6 +153,10 @@ {($DataBase.zoomsize)}% +{language.lineHeight} + +{($DataBase.lineHeight)} + {language.iconSize} {($DataBase.iconsize)}% diff --git a/src/lib/UI/GUI/TextAreaResizable.svelte b/src/lib/UI/GUI/TextAreaResizable.svelte index ba7add51..5b546549 100644 --- a/src/lib/UI/GUI/TextAreaResizable.svelte +++ b/src/lib/UI/GUI/TextAreaResizable.svelte @@ -32,5 +32,5 @@ bind:value={value} class="rounded-md p-2 text-textcolor bg-transparent resize-none overflow-y-hidden border border-darkborderc" style:font-size="{0.875 * ($DataBase.zoomsize / 100)}rem" - style:line-height="{1.25 * ($DataBase.zoomsize / 100)}rem" + style:line-height="{($DataBase.lineHeight ?? 1.25) * ($DataBase.zoomsize / 100)}rem" /> \ No newline at end of file diff --git a/src/styles.css b/src/styles.css index 149f3156..4f066c50 100644 --- a/src/styles.css +++ b/src/styles.css @@ -30,7 +30,6 @@ body{ --risu-theme-darkbutton: #374151; --risu-height-size: 100%; --risu-font-family: Arial, sans-serif, serif; - } .x-risu-language-json{ diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts index 4c07e9f5..e75eadc7 100644 --- a/src/ts/storage/database.ts +++ b/src/ts/storage/database.ts @@ -415,6 +415,7 @@ export function setDatabase(data:Database){ data.customTextTheme.FontColorQuote2 ??= '#FFB86C' data.font ??= 'default' data.customFont ??= '' + data.lineHeight ??= 1.25 changeLanguage(data.language) DataBase.set(data) } @@ -684,6 +685,7 @@ export interface Database{ dallEQuality:string font: string customFont: string + lineHeight: number } export interface customscript{