gui: Fix debug console font & default font size

- Adds the font Inconsolata-Regular to the application database. This font is licensed under the Open Font License. More information can be found here: https://fonts.google.com/specimen/Inconsolata?query=Inconsolata - Sets the global default font to 10pt rather than pixels to deal with any further DPI scaling issues. - Fixes missing elements in native_stylesheet.css that were not alllowing the RPC font to display correctly in the RPC console. (The stylesheets really need to be reworked entirely although this satisfies the scope of this PR)
jamescowens · Oct 4, 2020 · 730d3ab · 730d3ab
1 parent 912d115
commit 730d3ab
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 5 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -380,6 +380,7 @@ RES_IMAGES = \
   qt/res/images/splash3.png
 
 RES_FONTS = \
+  qt/res/fonts/Inconsolata-Regular.ttf \
   qt/res/fonts/Inter-Regular.ttf
 
 RES_STYLESHEETS = \

diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
@@ -99,6 +99,7 @@
         <file alias="ic_solo_inactive">res/images/ic_solo_inactive.svg</file>
     </qresource>
     <qresource prefix="/fonts">
+        <file alias="inconsolata-regular">res/fonts/Inconsolata-Regular.ttf</file>
         <file alias="inter-regular">res/fonts/Inter-Regular.ttf</file>
     </qresource>
     <qresource prefix="/movies"/>

diff --git a/src/qt/res/fonts/Inconsolata-Regular.ttf b/src/qt/res/fonts/Inconsolata-Regular.ttf
diff --git a/src/qt/res/stylesheets/dark_stylesheet.qss b/src/qt/res/stylesheets/dark_stylesheet.qss
@@ -2,6 +2,7 @@
 
 * {
     font-family: "Inter";
+    font-size: 10pt;
 }
 
 
@@ -352,6 +353,7 @@ QTabBar::tab:!first {
     margin-left: -0.065em;
 }
 
+
 QTabBar::tab:selected {
     background-color: rgb(58, 64, 69);
     border-bottom-color: rgb(58, 64, 69);
@@ -367,10 +369,16 @@ QTabBar::tab:!selected:hover {
     background-color: rgb(58, 64, 69);
 }
 
-QTextEdit{
+QTextEdit {
     background-color: rgb(35,38,41);
 }
 
+/* RPC Console */
+#messagesWidget {
+    font-family: "Inconsolata";
+    font-size: 10pt;
+}
+
 QPlainTextEdit{
     background-color: rgb(35,38,41);
 }

diff --git a/src/qt/res/stylesheets/light_stylesheet.qss b/src/qt/res/stylesheets/light_stylesheet.qss
@@ -2,6 +2,7 @@
 
 * {
     font-family: "Inter";
+    font-size: 10pt;
 }
 
 QMainWindow {
@@ -351,10 +352,16 @@ QTabBar::tab:!selected:hover {
     background: rgb(255, 255, 255);
 }
 
-QTextEdit{
+QTextEdit {
     background-color: white;
 }
 
+/* RPC Console */
+#messagesWidget {
+    font-family: "Inconsolata";
+    font-size: 10pt;
+}
+
 QPlainTextEdit{
     background-color: white;
 }

diff --git a/src/qt/res/stylesheets/native_stylesheet.qss b/src/qt/res/stylesheets/native_stylesheet.qss
@@ -1,7 +1,22 @@
 /* general */
 
+* {
+    font-family: "Inter";
+    font-size: 10pt;
+}
+
 QMainWindow {
-    font-family:'Open Sans';
+    font-family: "Inter";
+}
+
+QTextEdit {
+    background-color: white;
+}
+
+/* RPC Console */
+#messagesWidget {
+    font-family: "Inconsolata";
+    font-size: 10pt;
 }
 
 /* Main Window*/

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -436,10 +436,11 @@ void RPCConsole::clear()
     }
 
     // Set default style sheet
+    QFontDatabase::addApplicationFont(":/fonts/Inconsolata-Regular.ttf");
     ui->messagesWidget->document()->setDefaultStyleSheet(
                 "table { }"
-                "td.time { color: #808080; padding-top: 3px; } "
-                "td.message { font-family: Monospace; font-size: 12px; } "
+                "td.time { color: #808080; valign: bottom;} "
+                "td.message { valign: bottom; } "
                 "td.cmd-request { color: #006060; } "
                 "td.cmd-error { color: red; } "
                 "b { color: #006060; } "