From 5d1042057b6669895053a0c7f1c95fb74440e13c Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 9 Dec 2020 19:57:30 +0100 Subject: [PATCH] Add Noto Sans Symbols2 to font fallbacks Also use the correct symbol for the return key (we were using another similar arrow because this one was not available in DejaVu Sans). Fixes #14034. Note that build/jam/repositories/HaikuPorts ships an old version of the Noto package that does not include the Symbols2 font. It should be updated. Adding this to the pile of lagging behind packages, alongside icu, mawk/gawk, and tnftp. Can anyone take care of it? --- src/kits/interface/MenuItem.cpp | 3 +-- src/preferences/keymap/KeyboardLayoutView.cpp | 2 +- src/servers/app/font/GlyphLayoutEngine.h | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kits/interface/MenuItem.cpp b/src/kits/interface/MenuItem.cpp index a20c3ad6ff..6f376b956f 100644 --- a/src/kits/interface/MenuItem.cpp +++ b/src/kits/interface/MenuItem.cpp @@ -42,8 +42,7 @@ const char* kUTF8ControlMap[] = { NULL, NULL, NULL, /* B_BACKSPACE */ "\xe2\x86\xb9", /* B_TAB U+21B9 */ - "\xe2\x86\xb5", /* B_ENTER, U+21B5 */ - //"\xe2\x8f\x8e", /* B_ENTER, U+23CE it's the official one */ + "\xe2\x8f\x8e", /* B_ENTER, U+23CE */ NULL, /* B_PAGE_UP */ NULL, /* B_PAGE_DOWN */ NULL, NULL, NULL, diff --git a/src/preferences/keymap/KeyboardLayoutView.cpp b/src/preferences/keymap/KeyboardLayoutView.cpp index 42ac436662..495854e052 100644 --- a/src/preferences/keymap/KeyboardLayoutView.cpp +++ b/src/preferences/keymap/KeyboardLayoutView.cpp @@ -927,7 +927,7 @@ KeyboardLayoutView::_SpecialMappedKeySymbol(const char* bytes, size_t numBytes) if (bytes[0] == B_TAB) return "\xe2\x86\xb9"; if (bytes[0] == B_ENTER) - return "\xe2\x86\xb5"; + return "\xe2\x8f\x8e"; if (bytes[0] == B_BACKSPACE) return "\xe2\x8c\xab"; diff --git a/src/servers/app/font/GlyphLayoutEngine.h b/src/servers/app/font/GlyphLayoutEngine.h index 066b0a79a4..983bd16637 100644 --- a/src/servers/app/font/GlyphLayoutEngine.h +++ b/src/servers/app/font/GlyphLayoutEngine.h @@ -337,7 +337,8 @@ GlyphLayoutEngine::_PopulateAndLockFallbacks( "Noto Sans Display", "Noto Sans Thai", "Noto Sans CJK JP", - "Noto Sans Symbols" + "Noto Sans Symbols", + "Noto Sans Symbols2" }; if (!gFontManager->Lock())