Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get the font directory from Windows #13825

Merged
merged 4 commits into from May 13, 2023
Merged

Get the font directory from Windows #13825

merged 4 commits into from May 13, 2023

Conversation

oltolm
Copy link
Contributor

@oltolm oltolm commented May 7, 2023

Get the font directory from Windows instead of hard coding it to C:/Windows/Fonts/. Also contains a small refactor of font::render_text_ex.

@Megamouse
Copy link
Contributor

I would like to fix this properly for all OSs.
You can actually just add a new Emulator callback and call:
QStandardPaths::standardLocations(QStandardPaths::StandardLocation::FontsLocation);
To enumerate the paths platform independent

Megamouse
Megamouse reviewed May 8, 2023
View reviewed changes
rpcs3/Emu/RSX/GL/GLOverlays.cpp Outdated Show resolved Hide resolved
rpcs3/Emu/RSX/VK/VKOverlays.cpp Outdated Show resolved Hide resolved
rpcs3/Emu/RSX/VK/VKOverlays.cpp Show resolved Hide resolved
rpcs3/main_application.cpp Outdated Show resolved Hide resolved
rpcs3/main_application.cpp Outdated Show resolved Hide resolved
rpcs3/main_application.cpp Outdated Show resolved Hide resolved
rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp Outdated Show resolved Hide resolved
@Megamouse
Copy link
Contributor

LGTM but needs testing on all platforms (I tested windows which seemed fine)

@hcorion
Copy link
Member

hcorion commented May 13, 2023

Looks good to me on Linux
image

@Megamouse Megamouse merged commit b0de597 into RPCS3:master May 13, 2023
5 checks passed
@oltolm oltolm deleted the windows_fonts_dir branch May 13, 2023 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Megamouse Megamouse Megamouse left review comments

Assignees
No one assigned
Labels
Overlay
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@oltolm @Megamouse @hcorion