Merge branch 'main' into fix_linux_open_in_folder

qt/aqt/toolbar.py

@@ -87,6 +87,7 @@ class TopWebView(ToolbarWebView):
             else:
                 self.flatten()
 
+        self.adjustHeightToFit()
         self.show()
 
     def _onHeight(self, qvar: int | None) -> None:

rslib/src/card/mod.rs

@@ -185,12 +185,16 @@ impl Card {
         self.usn = usn;
     }
 
-    /// Caller must ensure provided deck exists and is not filtered.
-    fn set_deck(&mut self, deck: DeckId) {
-        self.remove_from_filtered_deck_restoring_queue();
+    pub fn clear_fsrs_data(&mut self) {
         self.memory_state = None;
         self.desired_retention = None;
         self.decay = None;
+    }
+
+    /// Caller must ensure provided deck exists and is not filtered.
+    fn set_deck(&mut self, deck: DeckId) {
+        self.remove_from_filtered_deck_restoring_queue();
+        self.clear_fsrs_data();
         self.deck_id = deck;
     }
 

rslib/src/scheduler/fsrs/memory_state.rs

@@ -188,9 +188,7 @@ impl Collection {
                     }
                 } else {
                     // clear FSRS data if FSRS is disabled
-                    card.memory_state = None;
-                    card.desired_retention = None;
-                    card.decay = None;
+                    card.clear_fsrs_data();
                 }
                 self.update_card_inner(&mut card, original, usn)?;
             }

ts/lib/tag-editor/TagEditor.svelte

@@ -510,7 +510,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         border: 1px solid var(--border);
         border-radius: var(--border-radius);
         padding: 6px;
-        margin: 1px;
+        margin: 1px 3px 3px 1px;
 
         &:focus-within {
             outline-offset: -1px;

ts/lib/tag-editor/TagInput.svelte

@@ -166,7 +166,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     function onKeydown(event: KeyboardEvent): void {
-        switch (event.code) {
+        switch (event.key) {
             case "Enter":
                 onEnter(event);
                 break;

ts/lib/tslib/keys.ts

@@ -90,7 +90,7 @@ export function keyToPlatformString(key: string): string {
 }
 
 export function isArrowLeft(event: KeyboardEvent): boolean {
-    if (event.code === "ArrowLeft") {
+    if (event.key === "ArrowLeft") {
         return true;
     }
 
@@ -98,7 +98,7 @@ export function isArrowLeft(event: KeyboardEvent): boolean {
 }
 
 export function isArrowRight(event: KeyboardEvent): boolean {
-    if (event.code === "ArrowRight") {
+    if (event.key === "ArrowRight") {
         return true;
     }
 
@@ -106,7 +106,7 @@ export function isArrowRight(event: KeyboardEvent): boolean {
 }
 
 export function isArrowUp(event: KeyboardEvent): boolean {
-    if (event.code === "ArrowUp") {
+    if (event.key === "ArrowUp") {
         return true;
     }
 
@@ -114,7 +114,7 @@ export function isArrowUp(event: KeyboardEvent): boolean {
 }
 
 export function isArrowDown(event: KeyboardEvent): boolean {
-    if (event.code === "ArrowDown") {
+    if (event.key === "ArrowDown") {
         return true;
     }
 

ts/routes/deck-options/FsrsOptions.svelte

@@ -391,7 +391,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     </button>
 </div>
 
-<div class="m-2">
+<hr />
+
+<div class="m-1">
     <button class="btn btn-primary" on:click={() => (showSimulator = true)}>
         {tr.deckConfigFsrsSimulatorExperimental()}
     </button>
@@ -419,4 +421,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         align-content: center;
         flex-wrap: wrap;
     }
+
+    hr {
+        border-top: 1px solid var(--border);
+        opacity: 1;
+    }
 </style>