Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-26 08:08:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

FontTrueType: Use the closed character size available when the requested is not available.

Browse Source
This commit is contained in:
Martín Lucas Golini
2022-02-05 01:17:51 -03:00
parent 50eb244f35
commit 619bf51a4d
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/eepp/graphics/fonttruetype.hpp
+1
View File
@@ -113,6 +113,7 @@ class EE_API FontTrueType : public Font {
mutable std::vector<Uint8>
mPixelBuffer; ///< Pixel buffer holding a glyph's pixels before being written to the texture
bool mBoldAdvanceSameAsRegular;
mutable std::map<unsigned int, unsigned int> mClosestCharacterSize;
};
}} // namespace EE::Graphics
src/eepp/graphics/fonttruetype.cpp
+31 -8
View File
@@ -323,8 +323,8 @@ GlyphDrawable* FontTrueType::getGlyphDrawable( Uint32 codePoint, unsigned int ch
GlyphDrawable* region = GlyphDrawable::New(
page.texture, glyph.textureRect,
String::format( "%s_%d_%u", mFontName.c_str(), characterSize, codePoint ) );
region->setGlyphOffset( {glyph.bounds.Left - outlineThickness,
characterSize + glyph.bounds.Top - outlineThickness} );
region->setGlyphOffset( { glyph.bounds.Left - outlineThickness,
characterSize + glyph.bounds.Top - outlineThickness } );
drawables[key] = region;
return region;
}
@@ -741,12 +741,35 @@ bool FontTrueType::setCurrentSize( unsigned int characterSize ) const {
// In the case of bitmap fonts, resizing can
// fail if the requested size is not available
if ( !FT_IS_SCALABLE( face ) ) {
Log::warning( "Failed to set bitmap font size to %d", characterSize );
Log::warning( "Available sizes are: " );
std::string str;
for ( int i = 0; i < face->num_fixed_sizes; ++i )
str += String::format( "%d ", face->available_sizes[i].height );
Log::warning( str );
auto it = mClosestCharacterSize.find( characterSize );
if ( it == mClosestCharacterSize.end() ) {
Log::warning( "Failed to set bitmap font size to %d", characterSize );
Log::warning( "Available sizes are: " );
std::string str;
if ( face->num_fixed_sizes > 0 ) {
unsigned int selectedHeight = face->available_sizes[0].height;
int curDistance = eeabs( characterSize - selectedHeight );
for ( int i = 0; i < face->num_fixed_sizes; ++i ) {
str += String::format( "%d ", face->available_sizes[i].height );
int tDistance =
eeabs( characterSize - face->available_sizes[i].height );
if ( tDistance < curDistance ) {
curDistance = tDistance;
selectedHeight = face->available_sizes[i].height;
}
}
Log::warning( str );
Log::warning( "Setting closest bitmap font size available: ",
selectedHeight );
mClosestCharacterSize[characterSize] = selectedHeight;
return setCurrentSize( selectedHeight );
} else {
return false;
}
} else {
return setCurrentSize( it->second );
}
}
}
src/tools/codeeditor/codeeditor.cpp
+1 -1
View File
@@ -179,7 +179,7 @@ void App::openFontDialog( std::string& fontPath ) {
std::string absoluteFontPath( fontPath );
if ( isRelativePath( absoluteFontPath ) )
absoluteFontPath = mResPath + fontPath;
UIFileDialog* dialog = UIFileDialog::New( UIFileDialog::DefaultFlags, "*.ttf; *.otf; *.wolff",
UIFileDialog* dialog = UIFileDialog::New( UIFileDialog::DefaultFlags, "*.ttf; *.otf; *.wolff; *.otb",
FileSystem::fileRemoveFileName( absoluteFontPath ) );
ModelIndex index = dialog->getMultiView()->getListView()->findRowWithText(
FileSystem::fileNameFromPath( fontPath ), true, true );