mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-25 11:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

some font fixes

Browse Source
This commit is contained in:
w1naenator 2025-03-31 12:59:11 +03:00
parent 57a997ecff
commit d3de64f1ff
3 changed files with 63 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeSettings.json
View File

@ -6,7 +6,7 @@
"configurationType": "Release",
"buildRoot": "${projectDir}\\Build\\${name}",
"installRoot": "${projectDir}\\Install\\${name}",
"cmakeCommandArgs": "",
"cmakeCommandArgs": "-DENABLE_QT_GUI=ON -DCMAKE_PREFIX_PATH=C:\\Qt\\6.8.2\\msvc2022_64",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "clang_cl_x64_x64" ],

63
src/core/libraries/ime/ime_keyboard_layouts.cpp
View File

@ -53,27 +53,26 @@ const std::vector<Key> kUppercaseLayout = {
{3, 9, 1, 1, "/", "", KeyType::Text},
// Row 5
{4, 0, 1, 1, "SF", "L2", KeyType::Shift}, //{4, 0, 1, 1, "⇧", "L2", KeyType::Shift},
{4, 1, 1, 1, "@#:", "L2+TRI", KeyType::SymbolsLayout},
{4, 0, 1, 1, "⬆", "L2", KeyType::Shift},
{4, 1, 1, 1, "@#:", "L2+△", KeyType::SymbolsLayout},
{4, 2, 1, 1, "à", "L3", KeyType::UnknownFunction},
{4, 3, 4, 1, "Space", "TRI", KeyType::Space}, //{4, 3, 4, 1, "Space", "△", KeyType::Space},
{4, 3, 4, 1, "Space", "△", KeyType::Space},
//{4, 4, 4, 1, "Space", "△", KeyType::Space},
//{4, 5, 4, 1, "Space", "△", KeyType::Space},
//{4, 6, 4, 1, "Space", "△", KeyType::Space},
{4, 7, 1, 1, "", "", KeyType::Disabled},
{4, 8, 2, 1, "DEL", "SQR", KeyType::Backspace}, //{4, 8, 2, 1, "⌫", "▢", KeyType::Backspace},
//{4, 9, 2, 1, "⌫", "▢", KeyType::Backspace},
{4, 8, 2, 1, "⇦", "□", KeyType::Backspace}, //{4, 8, 2, 1, "⌫", "□", KeyType::Backspace},
//{4, 9, 2, 1, "⌫", "□", KeyType::Backspace},
// Row 6
{5, 0, 1, 1, "UP", "", KeyType::CursorUp}, //{5, 0, 1, 1, "▲", "", KeyType::CursorUp},
{5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown},
{5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft},
{5, 3, 1, 1, "RT", "R1", KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
{5, 0, 1, 1, "▲", "", KeyType::CursorUp},
{5, 1, 1, 1, "▼", "", KeyType::CursorDown},
{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft},
{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
{5, 4, 1, 1, "KB", "",
KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard},
{5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions},
{5, 6, 1, 1, "CR", "R1",
KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction},
{5, 6, 1, 1, "+/⊗", "R3", KeyType::ControllerAction},
{5, 7, 1, 1, "", "", KeyType::Disabled},
{5, 8, 2, 1, "Done", "R2", KeyType::Done},
//{5, 9, 2, 1, "Done", "R2", KeyType::Done},
@ -129,28 +128,26 @@ const std::vector<Key> kLowercaseLayout = {
{3, 9, 1, 1, "_", "", KeyType::Text},
// Row 5
{4, 0, 1, 1, "SF", "L2", KeyType::Shift}, //{4, 0, 1, 1, "⇧", "L2", KeyType::Shift},
{4, 1, 1, 1, "@#:", "L2+TRI",
KeyType::SymbolsLayout}, //{4, 1, 1, 1, "@#:", "L2+△", KeyType::Symbols},
{4, 0, 1, 1, "⇧", "L2", KeyType::Shift},
{4, 1, 1, 1, "@#:", "L2+△", KeyType::SymbolsLayout},
{4, 2, 1, 1, "à", "L3", KeyType::UnknownFunction},
{4, 3, 4, 1, "Space", "TRI", KeyType::Space}, //{4, 3, 4, 1, "Space", "△", KeyType::Space},
{4, 3, 4, 1, "Space", "△", KeyType::Space},
//{4, 4, 4, 1, "Space", "△", KeyType::Space},
//{4, 5, 4, 1, "Space", "△", KeyType::Space},
//{4, 6, 4, 1, "Space", "△", KeyType::Space},
{4, 7, 1, 1, "", "", KeyType::Disabled},
{4, 8, 2, 1, "DEL", "SQR", KeyType::Backspace}, //{4, 8, 2, 1, "⌫", "▢", KeyType::Backspace},
//{4, 8, 2, 1, "⌫", "▢", KeyType::Backspace},
{4, 8, 2, 1, "⇦", "□", KeyType::Backspace}, //{4, 8, 2, 1, "⌫", "□", KeyType::Backspace},
//{4, 8, 2, 1, "⌫", "□", KeyType::Backspace},
// Row 6
{5, 0, 1, 1, "UP", "", KeyType::CursorUp}, // {5, 0, 1, 1, "▲", "", KeyType::CursorUp},
{5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown},
{5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft},
{5, 3, 1, 1, "RT", "R1", KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
{5, 0, 1, 1, "▲", "", KeyType::CursorUp},
{5, 1, 1, 1, "▼", "", KeyType::CursorDown},
{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft},
{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
{5, 4, 1, 1, "KB", "",
KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard},
{5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions},
{5, 6, 1, 1, "CR", "R1",
KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction},
{5, 6, 1, 1, "+/⊗", "R3", KeyType::ControllerAction},
{5, 7, 1, 1, "", "", KeyType::Disabled},
{5, 8, 2, 1, "Done", "R2", KeyType::Done},
//{5, 9, 2, 1, "Done", "R2", KeyType::Done},
@ -207,27 +204,25 @@ const std::vector<Key> kSymbols1Layout = {
// Row 5
{4, 0, 1, 1, "", "", KeyType::Disabled},
{4, 1, 1, 1, "ABC", "L2+TRI",
KeyType::TextLayout}, //{4, 1, 1, 1, "ABC", "L2+△", KeyType::Symbols},
{4, 1, 1, 1, "ABC", "L2+△", KeyType::TextLayout},
{4, 2, 1, 1, "", "", KeyType::Disabled},
{4, 3, 4, 1, "Space", "TRI", KeyType::Space}, //{4, 3, 4, 1, "Space", "△", KeyType::Space},
{4, 3, 4, 1, "Space", "△", KeyType::Space},
//{4, 4, 4, 1, "Space", "△", KeyType::Space},
//{4, 5, 4, 1, "Space", "△", KeyType::Space},
//{4, 6, 4, 1, "Space", "△", KeyType::Space},
{4, 7, 1, 1, "", "", KeyType::Disabled},
{4, 8, 2, 1, "DEL", "SQR", KeyType::Backspace}, //{4, 8, 2, 1, "⌫", "▢", KeyType::Backspace},
//{4, 9, 2, 1, "⌫", "▢", KeyType::Backspace},
{4, 8, 2, 1, "⇦", "□", KeyType::Backspace}, //{4, 8, 2, 1, "⌫", "□", KeyType::Backspace},
//{4, 9, 2, 1, "⌫", "□", KeyType::Backspace},
// Row 6
{5, 0, 1, 1, "UP", "", KeyType::CursorUp}, // {5, 0, 1, 1, "▲", "", KeyType::CursorUp},
{5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown},
{5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft},
{5, 3, 1, 1, "RT", "R1", KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
{5, 0, 1, 1, "▲", "", KeyType::CursorUp},
{5, 1, 1, 1, "▼", "", KeyType::CursorDown},
{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft},
{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
{5, 4, 1, 1, "KB", "",
KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard},
{5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions},
{5, 6, 1, 1, "CR", "R1",
KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction},
{5, 6, 1, 1, "+/⊗", "R3", KeyType::ControllerAction},
{5, 7, 1, 1, "", "", KeyType::Disabled},
{5, 8, 2, 1, "Done", "R2", KeyType::Done},
//{5, 9, 2, 1, "Done", "R2", KeyType::Done},

33
src/imgui/renderer/imgui_core.cpp
View File

@ -69,14 +69,47 @@ void Initialize(const ::Vulkan::Instance& instance, const Frontend::WindowSDL& w
rb.AddRanges(io.Fonts->GetGlyphRangesKorean());
rb.AddRanges(io.Fonts->GetGlyphRangesJapanese());
rb.AddRanges(io.Fonts->GetGlyphRangesCyrillic());
rb.AddChar(0x00D7); // × Cross
rb.AddChar(0x25CB); // ○ Circle
rb.AddChar(0x25B3); // △ Triangle
rb.AddChar(0x25A1); // □ Square
rb.AddChar(0x2191); // ↑ Up Arrow
rb.AddChar(0x2193); // ↓ Down Arrow
rb.AddChar(0x2190); // ← Left Arrow
rb.AddChar(0x2192); // → Right Arrow
rb.AddChar(0x2297); // ⊗ Circled Times (often used as cross)
rb.AddChar(0x2BBE); // ⮾ Circled X (if supported by font)
rb.AddChar(0x1F5D9); // 🗙 Cancellation X (heavy)
rb.AddChar(0x25C0); // ◀ Black Left-Pointing Triangle
rb.AddChar(0x25B2); // ▲ Black Up-Pointing Triangle
rb.AddChar(0x25B6); // ▶ Black Right-Pointing Triangle
rb.AddChar(0x25BC); // ▼ Black Down-Pointing Triangle
rb.AddChar(0x232B); // ⌫ Backspace
rb.AddChar(0x21E7); // ⇧ UPWARDS WHITE ARROW
rb.AddChar(0x2B06); // ⬆ UPWARDS BLACK ARROW
rb.AddChar(0x21E6); // ⇦ Leftwards White Arrow
//rb.AddRanges(io.Fonts->GetGlyphRangesDefault());
// Manually add full BMP range
//for (ImWchar c = 0x0020; c <= 0xFFFF; ++c) {
// rb.AddChar(c);
//}
ImVector<ImWchar> ranges{};
rb.BuildRanges(&ranges);
ImFontConfig font_cfg{};
font_cfg.OversampleH = 2;
font_cfg.OversampleV = 1;
font_cfg.MergeMode = false;
io.FontDefault = io.Fonts->AddFontFromMemoryCompressedTTF(
imgui_font_notosansjp_regular_compressed_data,
imgui_font_notosansjp_regular_compressed_size, 16.0f, &font_cfg, ranges.Data);
font_cfg.MergeMode = true;
io.Fonts->AddFontFromMemoryCompressedTTF(imgui_font_proggyvector_regular_compressed_data,
imgui_font_proggyvector_regular_compressed_size,
16.0f);