From a550c870f34556008bfcf9c452a403acd3799130 Mon Sep 17 00:00:00 2001 From: gdosu Date: Wed, 24 Jan 2024 13:34:19 +0900 Subject: [PATCH 1/5] Add memory limit border thickness --- src/lang/en.ts | 1 + src/lang/ko.ts | 1 + src/lib/ChatScreens/Chat.svelte | 5 +++++ src/lib/Setting/Pages/DisplaySettings.svelte | 6 ++++++ src/styles.css | 2 +- src/ts/storage/database.ts | 2 ++ 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/lang/en.ts b/src/lang/en.ts index bf005d77..a327e405 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -506,4 +506,5 @@ export const languageEnglish = { openrouterMiddleOut: "Openrouter Middle Out", geminiApiKey: "Gemini API Key", removePunctuationHypa: "Memory Punctuation Removal", + memoryLimitThickness: "Memory Limit Thickness", } \ No newline at end of file diff --git a/src/lang/ko.ts b/src/lang/ko.ts index 0e0f2b69..cd71656e 100644 --- a/src/lang/ko.ts +++ b/src/lang/ko.ts @@ -428,4 +428,5 @@ export const languageKorean = { genTimes: "생성 횟수", template: "템플릿", editTranslationDisplay: "번역문 수정", + memoryLimitThickness: "기억 한계선 두께", } \ No newline at end of file diff --git a/src/lib/ChatScreens/Chat.svelte b/src/lib/ChatScreens/Chat.svelte index 547294f7..cca729de 100644 --- a/src/lib/ChatScreens/Chat.svelte +++ b/src/lib/ChatScreens/Chat.svelte @@ -116,6 +116,11 @@ } $: displaya(message) + + $: { + document.documentElement.style.setProperty('--memory-limit-thickness', $DataBase.memoryLimitThickness + 'px'); + console.log($DataBase.memoryLimitThickness) + }
diff --git a/src/lib/Setting/Pages/DisplaySettings.svelte b/src/lib/Setting/Pages/DisplaySettings.svelte index 8bc24df7..0ea8e91c 100644 --- a/src/lib/Setting/Pages/DisplaySettings.svelte +++ b/src/lib/Setting/Pages/DisplaySettings.svelte @@ -88,6 +88,12 @@ {(`${($DataBase.animationSpeed).toFixed(2)}s`)} +{#if $DataBase.showMemoryLimit} + {language.memoryLimitThickness} + + {($DataBase.memoryLimitThickness)}px +{/if} +
diff --git a/src/styles.css b/src/styles.css index 6219fd08..f7ad7742 100644 --- a/src/styles.css +++ b/src/styles.css @@ -157,7 +157,7 @@ html, body{ } .bgc{ - border-top: 1px solid rgba(98, 114, 164, 0.7); + border-top: var(--memory-limit-thickness) solid rgba(98, 114, 164, 0.7); } .text-bordered{ diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts index 360f5111..dd9e7e60 100644 --- a/src/ts/storage/database.ts +++ b/src/ts/storage/database.ts @@ -365,6 +365,7 @@ export function setDatabase(data:Database){ data.openrouterFallback ??= true data.openrouterMiddleOut ??= false data.removePunctuationHypa ??= true + data.memoryLimitThickness ??= 1 changeLanguage(data.language) DataBase.set(data) @@ -583,6 +584,7 @@ export interface Database{ claudeAws:boolean lastPatchNoteCheckVersion?:string, removePunctuationHypa?:boolean + memoryLimitThickness?:number } export interface customscript{ From f524cf0f950d4478529b4f9438eb3a3eb9f33a48 Mon Sep 17 00:00:00 2001 From: gdosu Date: Wed, 24 Jan 2024 13:54:33 +0900 Subject: [PATCH 2/5] remove test log --- src/lib/ChatScreens/Chat.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/ChatScreens/Chat.svelte b/src/lib/ChatScreens/Chat.svelte index cca729de..1bce9f5b 100644 --- a/src/lib/ChatScreens/Chat.svelte +++ b/src/lib/ChatScreens/Chat.svelte @@ -119,7 +119,6 @@ $: { document.documentElement.style.setProperty('--memory-limit-thickness', $DataBase.memoryLimitThickness + 'px'); - console.log($DataBase.memoryLimitThickness) }
From 87fbf07bcf53b8a912d40235862e16d4439666e5 Mon Sep 17 00:00:00 2001 From: gdosu Date: Wed, 24 Jan 2024 20:38:18 +0900 Subject: [PATCH 3/5] Reduced duplicated call --- src/lib/ChatScreens/Chat.svelte | 4 ---- src/lib/ChatScreens/DefaultChatScreen.svelte | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/ChatScreens/Chat.svelte b/src/lib/ChatScreens/Chat.svelte index 1bce9f5b..547294f7 100644 --- a/src/lib/ChatScreens/Chat.svelte +++ b/src/lib/ChatScreens/Chat.svelte @@ -116,10 +116,6 @@ } $: displaya(message) - - $: { - document.documentElement.style.setProperty('--memory-limit-thickness', $DataBase.memoryLimitThickness + 'px'); - }
diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte index 22991339..f6703f40 100644 --- a/src/lib/ChatScreens/DefaultChatScreen.svelte +++ b/src/lib/ChatScreens/DefaultChatScreen.svelte @@ -378,6 +378,9 @@ $: { currentCharacter = $CurrentCharacter } + $: { + document.documentElement.style.setProperty('--memory-limit-thickness', $DataBase.memoryLimitThickness + 'px'); + }
{ From 9699c77415f63933a939f42b8456803c365133f9 Mon Sep 17 00:00:00 2001 From: gdosu Date: Thu, 25 Jan 2024 01:41:06 +0900 Subject: [PATCH 4/5] increase max value --- src/lib/Setting/Pages/DisplaySettings.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Setting/Pages/DisplaySettings.svelte b/src/lib/Setting/Pages/DisplaySettings.svelte index 0ea8e91c..0f2ea903 100644 --- a/src/lib/Setting/Pages/DisplaySettings.svelte +++ b/src/lib/Setting/Pages/DisplaySettings.svelte @@ -90,7 +90,7 @@ {#if $DataBase.showMemoryLimit} {language.memoryLimitThickness} - + {($DataBase.memoryLimitThickness)}px {/if} From 43efaa231333205b317d691eb66631e144e61da6 Mon Sep 17 00:00:00 2001 From: bangonicdd <133192207+bangonicdd@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:16:06 +0900 Subject: [PATCH 5/5] Change to inline style from reactive declarations --- src/lib/ChatScreens/Chat.svelte | 2 +- src/lib/ChatScreens/DefaultChatScreen.svelte | 3 --- src/styles.css | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/ChatScreens/Chat.svelte b/src/lib/ChatScreens/Chat.svelte index 547294f7..b9199bec 100644 --- a/src/lib/ChatScreens/Chat.svelte +++ b/src/lib/ChatScreens/Chat.svelte @@ -117,7 +117,7 @@ $: displaya(message) -
+
{#await img}
{ diff --git a/src/styles.css b/src/styles.css index f7ad7742..6219fd08 100644 --- a/src/styles.css +++ b/src/styles.css @@ -157,7 +157,7 @@ html, body{ } .bgc{ - border-top: var(--memory-limit-thickness) solid rgba(98, 114, 164, 0.7); + border-top: 1px solid rgba(98, 114, 164, 0.7); } .text-bordered{