From d5f4860f9b70b465e760d7e0b94b5b6a8c105f8d Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Thu, 20 May 2021 13:15:17 +1000
Subject: [PATCH] fix fields/cards font size & too-large toolbar on high DPI
 Windows

- enable default_css on editor again, so that the html element
is set to the system font size. If this is bringing in unwanted styling,
maybe we can come up with a different solution that just adjusts the
fonts
- make toolbar size relative to html font size, instead of hard-coding
it
---
 qt/aqt/editor.py                     | 2 +-
 ts/deckoptions/ConfigSelector.svelte | 2 +-
 ts/editor/EditorToolbar.svelte       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index e7b4cf254..db591a37b 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -139,7 +139,7 @@ class Editor:
                 "js/editor.js",
             ],
             context=self,
-            default_css=False,
+            default_css=True,
         )
 
         lefttopbtns: List[str] = []
diff --git a/ts/deckoptions/ConfigSelector.svelte b/ts/deckoptions/ConfigSelector.svelte
index 7abf1f435..836f53559 100644
--- a/ts/deckoptions/ConfigSelector.svelte
+++ b/ts/deckoptions/ConfigSelector.svelte
@@ -31,7 +31,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <StickyBar>
-    <WithTheming style="--toolbar-size: 35px; --toolbar-wrap: nowrap">
+    <WithTheming style="--toolbar-size: 2.3rem; --toolbar-wrap: nowrap">
         <ButtonToolbar class="justify-content-between">
             <ButtonToolbarItem>
                 <ButtonGroup class="flex-grow-1">
diff --git a/ts/editor/EditorToolbar.svelte b/ts/editor/EditorToolbar.svelte
index 635c5eb2e..577948c86 100644
--- a/ts/editor/EditorToolbar.svelte
+++ b/ts/editor/EditorToolbar.svelte
@@ -48,10 +48,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export const colorButtons = {};
     export const templateButtons = {};
 
-    export let size: number = 30;
+    export let size: number = 2;
     export let wraps: boolean = true;
 
-    $: style = `--toolbar-size: ${size}px; --toolbar-wrap: ${
+    $: style = `--toolbar-size: ${size}rem; --toolbar-wrap: ${
         wraps ? "wrap" : "nowrap"
     }`;
 </script>