Refactor fonts manager #3401
Merged
Refactor fonts manager #3401
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # source/MRViewer/MRRibbonFontManager.cpp
HolyBlackCat
approved these changes
Sep 23, 2024
oitel
reviewed
Sep 23, 2024
| { | ||
| assert( false && "Failed to load font!" ); | ||
| spdlog::error( "Failed to load font from `{}`.", filename ); | ||
|
|
||
| ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF( droid_sans_compressed_data, | ||
| font =ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF( droid_sans_compressed_data, |
There was a problem hiding this comment.
Will it be loaded multiple times if multiple fonts fail to load?
There was a problem hiding this comment.
Yes in different sizes
There was a problem hiding this comment.
Yes, it will be loaded for each failed font
Comment on lines
49
to
56
| FontData{.uniqueFontType = UniqueFont::Regular}, | ||
| FontData{.uniqueFontType = UniqueFont::Regular}, | ||
| FontData{.uniqueFontType = UniqueFont::SemiBold}, | ||
| FontData{.uniqueFontType = UniqueFont::Icons}, | ||
| FontData{.uniqueFontType = UniqueFont::Regular}, | ||
| FontData{.uniqueFontType = UniqueFont::SemiBold}, | ||
| FontData{.uniqueFontType = UniqueFont::SemiBold}, | ||
| FontData{.uniqueFontType = UniqueFont::Monospace} |
There was a problem hiding this comment.
The values are unclear from here.
| } | ||
| else if ( type == FontType::SemiBold ) | ||
| ImGuiIO& io = ImGui::GetIO(); | ||
| const ImWchar wRange[] = { 0x0057, 0x0057, 0 }; |
There was a problem hiding this comment.
The source/meaning of the constant?
| @@ -25,6 +25,20 @@ class MRVIEWER_CLASS RibbonFontManager | |||
| Count | |||
| }; | |||
|
|
|||
| // Unique fonts that are used for different FontTypes | |||
| enum class UniqueFont | |||
oitel
approved these changes
Sep 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR simplifies font loading, no hardcoded offsets needed:
(separates loading in two steps: load single glyph and calculate desired offset, load all requested glyphs with calculated offset)
Also allows users to set custom font paths