Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-12 19:20:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge tbc_font-28+knots

Browse Source
This commit is contained in:
Luke Dashjr 2025-03-05 03:27:08 +00:00
commit 458c5339ce
6 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -1915,6 +1915,7 @@ AM_CONDITIONAL([TARGET_DARWIN], [test "$TARGET_OS" = "darwin"])
AM_CONDITIONAL([BUILD_DARWIN], [test "$BUILD_OS" = "darwin"]) AM_CONDITIONAL([BUILD_DARWIN], [test "$BUILD_OS" = "darwin"])
AM_CONDITIONAL([TARGET_LINUX], [test "$TARGET_OS" = "linux"]) AM_CONDITIONAL([TARGET_LINUX], [test "$TARGET_OS" = "linux"])
AM_CONDITIONAL([TARGET_WINDOWS], [test "$TARGET_OS" = "windows"]) AM_CONDITIONAL([TARGET_WINDOWS], [test "$TARGET_OS" = "windows"])
AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
AM_CONDITIONAL([ENABLE_WALLET], [test "$enable_wallet" = "yes"]) AM_CONDITIONAL([ENABLE_WALLET], [test "$enable_wallet" = "yes"])
AM_CONDITIONAL([USE_SQLITE], [test "$use_sqlite" = "yes"]) AM_CONDITIONAL([USE_SQLITE], [test "$use_sqlite" = "yes"])
AM_CONDITIONAL([USE_BDB], [test "$use_bdb" = "yes"]) AM_CONDITIONAL([USE_BDB], [test "$use_bdb" = "yes"])

13
src/Makefile.am
View File

@ -1218,6 +1218,19 @@ if ENABLE_BENCH
include Makefile.bench.include include Makefile.bench.include
endif endif
# Font handling must be here, not in Makefile.qt.include, since the output is distributed with the source tarball
RES_MONOSPACE_FONT_INPUT = qt/res/fonts/RobotoTonalMono-Bold.ttf.in
RES_MONOSPACE_FONT = qt/res/fonts/RobotoTonalMono-Bold.ttf
EXTRA_DIST += $(RES_MONOSPACE_FONT_INPUT) $(RES_MONOSPACE_FONT)
if HAVE_PYTHON
$(RES_MONOSPACE_FONT): $(RES_MONOSPACE_FONT_INPUT)
@$(MKDIR_P) "$(@D)"
$(AM_V_GEN) $(PYTHON) -c 'import base64, lzma, sys; sys.stdout.buffer.write(lzma.decompress(base64.b85decode(sys.stdin.read())))' <"$<" >"$@.new" && mv "$@.new" "$@"
endif
if ENABLE_QT if ENABLE_QT
include Makefile.qt.include include Makefile.qt.include
endif endif

4
src/Makefile.qt.include
View File

@ -180,7 +180,7 @@ BITCOIN_QT_H = \
qt/winshutdownmonitor.h qt/winshutdownmonitor.h
QT_RES_FONTS = \ QT_RES_FONTS = \
qt/res/fonts/RobotoMono-Bold.ttf $(RES_MONOSPACE_FONT)
QT_RES_ICONS = $(RES_RENDERED_ICONS) \ QT_RES_ICONS = $(RES_RENDERED_ICONS) \
qt/res/icons/add.png \ qt/res/icons/add.png \
@ -395,7 +395,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
@rm $(@D)/temp_$(<F) @rm $(@D)/temp_$(<F)
$(QT_QRC_BUILD): $(QT_QRC) $(QT_QRC_BUILD): $(QT_QRC)
$(SED) -e 's:\(res\/\(icons\|animation\|fonts\)/\):$(abs_srcdir)/qt/\1:' <"$<" >"$@" $(SED) -e 's:\(res\/\(icons\|animation\)/\):$(abs_srcdir)/qt/\1:' <"$<" >"$@"
$(QT_QRC_CPP): $(QT_QRC_BUILD) $(QT_FORMS_H) $(QT_RES_FONTS) $(QT_RES_ICONS) $(QT_RES_ANIMATION) $(QT_QRC_CPP): $(QT_QRC_BUILD) $(QT_FORMS_H) $(QT_RES_FONTS) $(QT_RES_ICONS) $(QT_RES_ANIMATION)
@test -f $(RCC) || (echo "rcc $(RCC) not found, but is required for generating qrc cpp files"; exit 1) @test -f $(RCC) || (echo "rcc $(RCC) not found, but is required for generating qrc cpp files"; exit 1)

2
src/qt/bitcoin.qrc
View File

@ -84,6 +84,6 @@
<file alias="spinner-035">res/animation/spinner-035.png</file> <file alias="spinner-035">res/animation/spinner-035.png</file>
</qresource> </qresource>
<qresource prefix="/fonts"> <qresource prefix="/fonts">
<file alias="monospace">res/fonts/RobotoMono-Bold.ttf</file> <file alias="monospace">res/fonts/RobotoTonalMono-Bold.ttf</file>
</qresource> </qresource>
</RCC> </RCC>

1
src/qt/res/fonts/RobotoTonalMono-Bold.ttf.in Normal file
View File

File diff suppressed because one or more lines are too long

4
src/qt/tonalutils.cpp
View File

@ -33,8 +33,8 @@ bool TonalUtils::Supported()
{ {
QFont default_font; QFont default_font;
if (font_supports_tonal(default_font)) return true; if (font_supports_tonal(default_font)) return true;
QFont last_resort_font(default_font.lastResortFamily()); // FIXME: This will fail if the default font has some non-Tonal glyphs but a fallback supports Tonal
if (font_supports_tonal(last_resort_font)) return true; // TODO: Check other fonts and ensure their usage when appropriate
return false; return false;
} }