Merge branch 'decrease-font-weight'

8 files changed, 10 insertions, 25 deletions

diff --git a/gui/assets/css/fonts.css b/gui/assets/css/fonts.css
index 1f51c1c4c0..f24a1273e0 100644
--- a/gui/assets/css/fonts.css
+++ b/gui/assets/css/fonts.css
@@ -1,37 +1,19 @@
 @font-face {
   font-family: 'Source Sans Pro';
-  font-weight: bold;
-  src: url('../fonts/SourceSansPro-Black.ttf') format('truetype');
-}
-
-@font-face {
-  font-family: 'Source Sans Pro';
-  font-weight: 900;
-  src: url('../fonts/SourceSansPro-Black.ttf') format('truetype');
-}
-
-@font-face {
-  font-family: 'Noto Sans Myanmar';
-  font-weight: bold;
-  src: url('../fonts/NotoSansMyanmar-Black.ttf') format('truetype');
+  font-weight: bold 900;
+  src: url('../fonts/SourceSansPro-Bold.ttf') format('truetype');
 }
 
 @font-face {
   font-family: 'Noto Sans Myanmar';
-  font-weight: 900;
-  src: url('../fonts/NotoSansMyanmar-Black.ttf') format('truetype');
-}
-
-@font-face {
-  font-family: 'Noto Sans Thai';
-  font-weight: bold;
-  src: url('../fonts/NotoSansThai-Black.ttf') format('truetype');
+  font-weight: bold 900;
+  src: url('../fonts/NotoSansMyanmar-Bold.ttf') format('truetype');
 }
 
 @font-face {
   font-family: 'Noto Sans Thai';
-  font-weight: 900;
-  src: url('../fonts/NotoSansThai-Black.ttf') format('truetype');
+  font-weight: bold 900;
+  src: url('../fonts/NotoSansThai-Bold.ttf') format('truetype');
 }
 
 @font-face {
diff --git a/gui/assets/fonts/NotoSansMyanmar-Black.ttf b/gui/assets/fonts/NotoSansMyanmar-Black.ttf
deleted file mode 100644
index 5446ac92cf..0000000000
--- a/gui/assets/fonts/NotoSansMyanmar-Black.ttf
+++ /dev/null
diff --git a/gui/assets/fonts/NotoSansMyanmar-Bold.ttf b/gui/assets/fonts/NotoSansMyanmar-Bold.ttf
new file mode 100644
index 0000000000..1a702fe3ed
--- /dev/null
+++ b/gui/assets/fonts/NotoSansMyanmar-Bold.ttf
diff --git a/gui/assets/fonts/NotoSansThai-Black.ttf b/gui/assets/fonts/NotoSansThai-Black.ttf
deleted file mode 100644
index 5dd9265f76..0000000000
--- a/gui/assets/fonts/NotoSansThai-Black.ttf
+++ /dev/null
diff --git a/gui/assets/fonts/NotoSansThai-Bold.ttf b/gui/assets/fonts/NotoSansThai-Bold.ttf
new file mode 100644
index 0000000000..ae0881254e
--- /dev/null
+++ b/gui/assets/fonts/NotoSansThai-Bold.ttf
diff --git a/gui/assets/fonts/SourceSansPro-Black.ttf b/gui/assets/fonts/SourceSansPro-Black.ttf
deleted file mode 100755
index 4569f24a21..0000000000
--- a/gui/assets/fonts/SourceSansPro-Black.ttf
+++ /dev/null
diff --git a/gui/assets/fonts/SourceSansPro-Bold.ttf b/gui/assets/fonts/SourceSansPro-Bold.ttf
new file mode 100644
index 0000000000..62a0a4d9b3
--- /dev/null
+++ b/gui/assets/fonts/SourceSansPro-Bold.ttf
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 4bd963f1b8..29baab992a 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -1731,7 +1731,6 @@ class ApplicationMain {
       fullscreenable: false,
       show: false,
       frame: this.guiSettings.unpinnedWindow,
-      transparent: !this.guiSettings.unpinnedWindow,
       webPreferences: {
         preload: path.join(__dirname, '../renderer/preloadBundle.js'),
         nodeIntegration: false,
@@ -1752,6 +1751,7 @@ class ApplicationMain {
           titleBarStyle: this.guiSettings.unpinnedWindow ? 'default' : 'customButtonsOnHover',
           minimizable: this.guiSettings.unpinnedWindow,
           closable: this.guiSettings.unpinnedWindow,
+          transparent: !this.guiSettings.unpinnedWindow,
         });
 
         // make the window visible on all workspaces and prevent the icon from showing in the dock
@@ -1775,6 +1775,9 @@ class ApplicationMain {
           // https://github.com/electron/electron/issues/25915
           alwaysOnTop: !this.guiSettings.unpinnedWindow,
           skipTaskbar: !this.guiSettings.unpinnedWindow,
+          // Workaround for sub-pixel anti-aliasing
+          // https://github.com/electron/electron/blob/main/docs/faq.md#the-font-looks-blurry-what-is-this-and-what-can-i-do
+          backgroundColor: '#fff',
         });
 
         appWindow.removeMenu();