diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-02-22 12:36:25 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-02-22 13:01:06 +0100 |
commit | 7fca189a2a9a524834d9485c4e391877c00c1971 (patch) | |
tree | 6b002852e16851b9aae2fd8d364bd1e46974ede6 /contrib | |
parent | 84af29337c3712a91220b5336078db1cd6553a3c (diff) | |
parent | 67f26319a0ca7e34e3db17d9330133622a40de09 (diff) |
Merge #79: Embed monospaced font
67f26319a0ca7e34e3db17d9330133622a40de09 gui: Add monospaced font settings (Hennadii Stepanov)
22e0114d055b0ac6cdc47af2968b5dc742ba055a qt: Choose monospaced font in C++ code rather in `*.ui` file (Hennadii Stepanov)
623de12d040af89ff7c25de6eb0a19c67179dc5f qt: Make GUIUtil::fixedPitchFont aware of embedded font (Hennadii Stepanov)
89e421918ee8b9c8439317f747e5c37f0733d94b gui: Add Roboto Mono font (Hennadii Stepanov)
Pull request description:
Qt does not guarantee that the actual applied font matches to the requested one.
It was noted (https://github.com/bitcoin/bitcoin/pull/16432#issuecomment-514486077):
> the monospace font looks a bit weird no macOS
... because it is _not_ monospaced.
Also some discrepancies I've noted on Windows while testing Qt 5.15 ([#19716](https://github.com/bitcoin/bitcoin/pull/19716)).
Of course, we could check the actual font with `QFontInfo`, and try to choose another font.
But this PR suggests to just embed a monospaced font, and get the GUI look (partially) independent from a platform.
[Roboto Mono](https://fonts.google.com/specimen/Roboto+Mono) was chosen after discussion with Bitcoin Design community, and due to its [Apache License, Version 2.0](https://fonts.google.com/specimen/Roboto+Mono#license).
Changes are scoped to the Overview page only.
---
Screenshots on macOS 10.15.6 (images are simulated by code patching):
- master (ca30d34cf94b7797272ef1920ca4b48716e7f999)

- this PR (3fdd5b6bd17a679d6e3876682266092159c52d59)

---
More screenshots added after https://github.com/bitcoin-core/gui/pull/79#issuecomment-782909149:
- Linux Mint 20.1 + Cinnamon DE

- Windows 10 (with depends)

- macOS Big Sur (with depends)

ACKs for top commit:
laanwj:
Tested ACK 67f26319a0ca7e34e3db17d9330133622a40de09
Tree-SHA512: a59775570b8ce314669ede50a0b69f53e8a47a41e7eea428835013240f0ce9afcff6e4c258895455b56806417ed877e5b7a9522f1904e95a5f435db8ccf6078c
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/debian/copyright | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/contrib/debian/copyright b/contrib/debian/copyright index a18c5bccc5..7ee7f056d9 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -87,6 +87,10 @@ Files: src/qt/res/icons/proxy.png Copyright: Cristian Mircea Messel License: public-domain +Files: src/qt/fonts/RobotoMono-Bold.ttf +License: Apache-2.0 +Comment: Site: https://fonts.google.com/specimen/Roboto+Mono + License: Expat Permission is hereby granted, free of charge, to any person obtaining a @@ -144,3 +148,14 @@ Comment: License: public-domain This work is in the public domain. + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. |