aiden
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FullscreenUI: Avoid more conflicts between emoji and PromptFont

Browse Source 
By moving them to the unused range.
pull/3468/head
Stenzek 4 months ago
parent 5b3e843b08
commit 2a6aa89efb
No known key found for this signature in database
4 changed files with 7246 additions and 7345 deletions
Show Stats Download Patch File Download Diff File

BIN
data/resources/fonts/promptfont.otf
View File

Binary file not shown.

66
dep/imgui/include/IconsPromptFont.h
Unescape Escape View File

@ -295,37 +295,39 @@
#define ICON_PF_KEY_X "\xEF\xBC\xB8"
#define ICON_PF_KEY_Y "\xEF\xBC\xB9"
#define ICON_PF_KEY_Z "\xEF\xBC\xBA"
#define ICON_PF_HEADPHONES "\xF0\x9F\x8E\xA7"
#define ICON_PF_MUSIC "\xF0\x9F\x8E\xB6"
#define ICON_PF_FISH "\xF0\x9F\x90\x9F"
#define ICON_PF_DANCE_PAD "\xF0\x9F\x92\x83"
#define ICON_PF_LAPTOP "\xF0\x9F\x92\xBB"
#define ICON_PF_DISKETTE "\xF0\x9F\x92\xBE"
#define ICON_PF_WRITE "\xF0\x9F\x93\x9D"
#define ICON_PF_PHONE "\xF0\x9F\x93\xB1"
#define ICON_PF_CAMERA "\xF0\x9F\x93\xB7"
#define ICON_PF_SPEAKER "\xF0\x9F\x94\x88"
#define ICON_PF_LIGHT_GUN "\xF0\x9F\x94\xAB"
#define ICON_PF_SFX_SOUND_EFFECT_NOISE "\xF0\x9F\x95\xAC"
#define ICON_PF_STEERING_WHEEL "\xF0\x9F\x95\xB8"
#define ICON_PF_FIGHT_STICK_JOYSTICK "\xF0\x9F\x95\xB9"
#define ICON_PF_VR_HEADSET "\xF0\x9F\x95\xBB"
#define ICON_PF_VR_CONTROLLER "\xF0\x9F\x95\xBC"
#define ICON_PF_FLIGHT_STICK "\xF0\x9F\x95\xBD"
#define ICON_PF_CPU_PROCESSOR "\xF0\x9F\x96\xA5"
#define ICON_PF_WEB_INTERNET_LINK "\xF0\x9F\x96\xA7"
#define ICON_PF_GPU_GRAPHICS_CARD "\xF0\x9F\x96\xA8"
#define ICON_PF_RAM_MEMORY "\xF0\x9F\x96\xAA"
#define ICON_PF_USB_STICK "\xF0\x9F\x96\xAB"
#define ICON_PF_DATABASE "\xF0\x9F\x96\xAC"
#define ICON_PF_HARD_DISK_DRIVE "\xF0\x9F\x96\xB4"
#define ICON_PF_SCREEN_VIDEO "\xF0\x9F\x96\xB5"
#define ICON_PF_TEXT_ENTRY_EDIT "\xF0\x9F\x96\xB9"
#define ICON_PF_SPEAKING_VOICE "\xF0\x9F\x97\xA3"
#define ICON_PF_LANGUAGE "\xF0\x9F\x97\xA9"
#define ICON_PF_EXIT_QUIT_LEAVE "\xF0\x9F\x9A\xAA"
#define ICON_PF_INFORMATION "\xF0\x9F\x9B\x88"
#define ICON_PF_SHOPPING_CART "\xF0\x9F\x9B\x92"
#define ICON_PF_HEADPHONES "\xF0\x9F\xB0\xB5"
#define ICON_PF_MUSIC "\xF0\x9F\xB0\xB6"
#define ICON_PF_FLAG_2 "\xF0\x9F\xB0\xB7"
#define ICON_PF_FISH "\xF0\x9F\xB0\xB8"
#define ICON_PF_DANCE_PAD "\xF0\x9F\xB0\xB9"
#define ICON_PF_LAPTOP "\xF0\x9F\xB0\xBA"
#define ICON_PF_DISKETTE "\xF0\x9F\xB0\xBB"
#define ICON_PF_WRITE "\xF0\x9F\xB0\xBC"
#define ICON_PF_PHONE "\xF0\x9F\xB0\xBD"
#define ICON_PF_SPEAKER "\xF0\x9F\xB0\xBE"
#define ICON_PF_LIGHT_GUN "\xF0\x9F\xB0\xBF"
#define ICON_PF_SFX_SOUND_EFFECT_NOISE "\xF0\x9F\xB1\x80"
#define ICON_PF_STEERING_WHEEL "\xF0\x9F\xB1\x81"
#define ICON_PF_FIGHT_STICK_JOYSTICK "\xF0\x9F\xB1\x82"
#define ICON_PF_VR_HEADSET "\xF0\x9F\xB1\x83"
#define ICON_PF_VR_CONTROLLER "\xF0\x9F\xB1\x84"
#define ICON_PF_FLIGHT_STICK "\xF0\x9F\xB1\x85"
#define ICON_PF_CPU_PROCESSOR "\xF0\x9F\xB1\x86"
#define ICON_PF_KEYBOARD_AND_MOUSE "\xF0\x9F\xB1\x87"
#define ICON_PF_WEB_INTERNET_LINK "\xF0\x9F\xB1\x88"
#define ICON_PF_GPU_GRAPHICS_CARD "\xF0\x9F\xB1\x89"
#define ICON_PF_RAM_MEMORY "\xF0\x9F\xB1\x8A"
#define ICON_PF_USB_STICK "\xF0\x9F\xB1\x8B"
#define ICON_PF_DATABASE "\xF0\x9F\xB1\x8C"
#define ICON_PF_KEYBOARD_ALT_2 "\xF0\x9F\xB1\x8D"
#define ICON_PF_MOUSE_ALT_2 "\xF0\x9F\xB1\x8E"
#define ICON_PF_HARD_DISK_DRIVE "\xF0\x9F\xB1\x8F"
#define ICON_PF_FULLSCREEN "\xF0\x9F\xB1\x90"
#define ICON_PF_TEXT_ENTRY_EDIT "\xF0\x9F\xB1\x91"
#define ICON_PF_LANGUAGE "\xF0\x9F\xB1\x92"
#define ICON_PF_EXIT_QUIT_LEAVE "\xF0\x9F\xB1\x93"
#define ICON_PF_INFORMATION "\xF0\x9F\xB1\x94"
#define ICON_PF_SHOPPING_CART "\xF0\x9F\xB1\x95"
#define ICON_PF_ACHIEVEMENTS_PROGRESSION "\xE2\x8E\xB2"
#define ICON_PF_ACHIEVEMENTS_MISSABLE "\xE2\x8E\xB3"
#define ICON_PF_ACHIEVEMENTS_WIN "\xE2\x8E\xB4"
@ -365,4 +367,4 @@
#define ICON_PF_ADD "\xE2\xAC\xBC"
#define ICON_PF_REMOVE "\xE2\xAC\xBD"
#define ICON_PF_TRASH "\xE2\xAC\xBE"
#define ICON_PF_FLOPPY_DISK "\xF0\x9F\x92\xBE"

14519
extras/fonts/promptfont.sfd
View File

File diff suppressed because it is too large Load Diff

6
src/core/fullscreen_ui.cpp
Unescape Escape View File

@ -4287,10 +4287,10 @@ void FullscreenUI::DrawInterfaceSettingsPage()
MenuHeading(FSUI_VSTR("Game Display"));
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_WINDOW_MAXIMIZE, "Start Fullscreen"),
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_PF_FULLSCREEN, "Start Fullscreen"),
FSUI_VSTR("Automatically switches to fullscreen mode when the program is started."), "Main",
"StartFullscreen", false);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_COMPUTER_MOUSE, "Double-Click Toggles Fullscreen"),
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_WINDOW_MAXIMIZE, "Double-Click Toggles Fullscreen"),
FSUI_VSTR("Switches between full screen and windowed when the window is double-clicked."), "Main",
"DoubleClickTogglesFullscreen", true);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_ARROW_POINTER, "Hide Cursor In Fullscreen"),
@ -7125,7 +7125,7 @@ void FullscreenUI::DrawPauseMenu()
[]() { OpenSaveStateSelector(s_state.current_game_serial, s_state.current_game_path, true); });
}
if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_PF_FLOPPY_DISK, "Save State"), has_game))
if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_PF_DISKETTE, "Save State"), has_game))
{
BeginTransition(
[]() { OpenSaveStateSelector(s_state.current_game_serial, s_state.current_game_path, false); });

Write Preview
Loading…
Cancel
Save