mirror of
https://github.com/FirestormViewer/phoenix-firestorm.git
synced 2026-08-14 08:53:53 +00:00
Merge branch 'project/fonts-update' into project/flat-ui-fonts-update
This commit is contained in:
Mnikolenko Productengine
@@ -2482,6 +2482,40 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
||||
<key>description</key>
|
||||
<string>Viewer fonts</string>
|
||||
</map>
|
||||
<key>google-fonts</key>
|
||||
<map>
|
||||
<key>copyright</key>
|
||||
<string>Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)</string>
|
||||
<key>description</key>
|
||||
<string>Google fonts</string>
|
||||
<key>license</key>
|
||||
<string>SIL Open Font License, Version 1.1</string>
|
||||
<key>license_file</key>
|
||||
<string>LICENSES/google_inter.txt</string>
|
||||
<key>name</key>
|
||||
<string>google-fonts</string>
|
||||
<key>platforms</key>
|
||||
<map>
|
||||
<key>common</key>
|
||||
<map>
|
||||
<key>archive</key>
|
||||
<map>
|
||||
<key>creds</key>
|
||||
<string>github</string>
|
||||
<key>hash</key>
|
||||
<string>22bcc72ed59926f00ed58a57f5e3cd3d9d82595f</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>sha1</string>
|
||||
<key>url</key>
|
||||
<string>https://api.github.com/repos/secondlife/3p-google-fonts/releases/assets/195509500</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>common</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>1.0.0.11083103671</string>
|
||||
</map>
|
||||
<key>viewer-manager</key>
|
||||
<map>
|
||||
<key>platforms</key>
|
||||
|
||||
@@ -20,4 +20,5 @@ use_prebuilt_binary(slvoice)
|
||||
|
||||
use_prebuilt_binary(nanosvg)
|
||||
use_prebuilt_binary(viewer-fonts)
|
||||
use_prebuilt_binary(google-fonts)
|
||||
use_prebuilt_binary(emoji_shortcodes)
|
||||
|
||||
@@ -141,6 +141,7 @@ LLFontFreetype::LLFontFreetype()
|
||||
mDescender(0.f),
|
||||
mLineHeight(0.f),
|
||||
mIsFallback(false),
|
||||
mHinting(EFontHinting::FORCE_AUTOHINT),
|
||||
mFTFace(nullptr),
|
||||
mRenderGlyphCount(0),
|
||||
mStyle(0),
|
||||
@@ -164,7 +165,7 @@ LLFontFreetype::~LLFontFreetype()
|
||||
// mFallbackFonts cleaned up by LLPointer destructor
|
||||
}
|
||||
|
||||
bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n)
|
||||
bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags)
|
||||
{
|
||||
// Don't leak face objects. This is also needed to deal with
|
||||
// changed font file names.
|
||||
@@ -188,6 +189,8 @@ bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
|
||||
return false;
|
||||
|
||||
mIsFallback = is_fallback;
|
||||
mHinting = hinting;
|
||||
mFontFlags = flags;
|
||||
F32 pixels_per_em = (point_size / 72.f)*vert_dpi; // Size in inches * dpi
|
||||
|
||||
error = FT_Set_Char_Size(mFTFace, /* handle to face object */
|
||||
@@ -243,6 +246,12 @@ bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
|
||||
{
|
||||
mStyle |= LLFontGL::BOLD;
|
||||
}
|
||||
else if (flags & LLFontGL::BOLD)
|
||||
{
|
||||
// FontGL applies programmatic bolding to fonts that are a part of 'bold' descriptor but don't have the bold style set.
|
||||
// Ex: Inter SemiBold doesn't have FT_STYLE_FLAG_BOLD and without this style it would be bolded programmatically.
|
||||
mStyle |= LLFontGL::BOLD;
|
||||
}
|
||||
|
||||
if(mFTFace->style_flags & FT_STYLE_FLAG_ITALIC)
|
||||
{
|
||||
@@ -350,7 +359,12 @@ F32 LLFontFreetype::getXKerning(llwchar char_left, llwchar char_right) const
|
||||
|
||||
llverify(!FT_Get_Kerning(mFTFace, left_glyph, right_glyph, ft_kerning_unfitted, &delta));
|
||||
|
||||
return delta.x*(1.f/64.f);
|
||||
if (mFTFace->face_flags & FT_FACE_FLAG_SCALABLE)
|
||||
{
|
||||
// Return the X advance
|
||||
return (F32)(delta.x * (1.0 / 64.0));
|
||||
}
|
||||
return (F32)delta.x;
|
||||
}
|
||||
|
||||
F32 LLFontFreetype::getXKerning(const LLFontGlyphInfo* left_glyph_info, const LLFontGlyphInfo* right_glyph_info) const
|
||||
@@ -365,7 +379,12 @@ F32 LLFontFreetype::getXKerning(const LLFontGlyphInfo* left_glyph_info, const LL
|
||||
|
||||
llverify(!FT_Get_Kerning(mFTFace, left_glyph, right_glyph, ft_kerning_unfitted, &delta));
|
||||
|
||||
return delta.x*(1.f/64.f);
|
||||
if (mFTFace->face_flags & FT_FACE_FLAG_SCALABLE)
|
||||
{
|
||||
// Return the X advance
|
||||
return (F32)(delta.x * (1.0 / 64.0));
|
||||
}
|
||||
return (F32)delta.x;
|
||||
}
|
||||
|
||||
bool LLFontFreetype::hasGlyph(llwchar wch) const
|
||||
@@ -635,7 +654,7 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, ll
|
||||
if (mFTFace == nullptr)
|
||||
return;
|
||||
|
||||
FT_Int32 load_flags = FT_LOAD_FORCE_AUTOHINT;
|
||||
FT_Int32 load_flags = (FT_Int32)mHinting;
|
||||
if (EFontGlyphType::Color == bitmap_type)
|
||||
{
|
||||
// We may not actually get a color render so our caller should always examine mFTFace->glyph->bitmap.pixel_mode
|
||||
@@ -678,7 +697,7 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, ll
|
||||
void LLFontFreetype::reset(F32 vert_dpi, F32 horz_dpi)
|
||||
{
|
||||
resetBitmapCache();
|
||||
loadFace(mName, mPointSize, vert_dpi ,horz_dpi, mIsFallback, 0);
|
||||
loadFace(mName, mPointSize, vert_dpi ,horz_dpi, mIsFallback, 0, mHinting, mFontFlags);
|
||||
if (!mIsFallback)
|
||||
{
|
||||
// This is the head of the list - need to rebuild ourself and all fallbacks.
|
||||
|
||||
@@ -42,6 +42,7 @@ struct FT_FaceRec_;
|
||||
typedef struct FT_FaceRec_* LLFT_Face;
|
||||
struct FT_StreamRec_;
|
||||
typedef struct FT_StreamRec_ LLFT_Stream;
|
||||
enum class EFontHinting : S32;
|
||||
|
||||
namespace ll
|
||||
{
|
||||
@@ -99,7 +100,7 @@ public:
|
||||
|
||||
// is_fallback should be true for fallback fonts that aren't used
|
||||
// to render directly (Unicode backup, primarily)
|
||||
bool loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n);
|
||||
bool loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags);
|
||||
|
||||
S32 getNumFaces(const std::string& filename);
|
||||
|
||||
@@ -163,7 +164,11 @@ private:
|
||||
bool setSubImageBGRA(U32 x, U32 y, U32 bitmap_num, U16 width, U16 height, const U8* data, U32 stride) const;
|
||||
bool hasGlyph(llwchar wch) const; // Has a glyph for this character
|
||||
LLFontGlyphInfo* addGlyph(llwchar wch, EFontGlyphType glyph_type) const; // Add a new character to the font if necessary
|
||||
LLFontGlyphInfo* addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index, EFontGlyphType bitmap_type) const; // Add a glyph from this font to the other (returns the glyph_index, 0 if not found)
|
||||
LLFontGlyphInfo* addGlyphFromFont(
|
||||
const LLFontFreetype *fontp,
|
||||
llwchar wch,
|
||||
U32 glyph_index,
|
||||
EFontGlyphType bitmap_type) const; // Add a glyph from this font to the other (returns the glyph_index, 0 if not found)
|
||||
void renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, llwchar wch) const;
|
||||
void insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const;
|
||||
|
||||
@@ -179,6 +184,8 @@ private:
|
||||
LLFT_Face mFTFace;
|
||||
|
||||
bool mIsFallback;
|
||||
EFontHinting mHinting;
|
||||
S32 mFontFlags;
|
||||
typedef std::pair<LLPointer<LLFontFreetype>, char_functor_t> fallback_font_t;
|
||||
typedef std::vector<fallback_font_t> fallback_font_vector_t;
|
||||
fallback_font_vector_t mFallbackFonts; // A list of fallback fonts to look for glyphs in (for Unicode chars)
|
||||
|
||||
@@ -90,14 +90,14 @@ void LLFontGL::destroyGL()
|
||||
mFontFreetype->destroyGL();
|
||||
}
|
||||
|
||||
bool LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n)
|
||||
bool LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags)
|
||||
{
|
||||
if(mFontFreetype == reinterpret_cast<LLFontFreetype*>(NULL))
|
||||
{
|
||||
mFontFreetype = new LLFontFreetype;
|
||||
}
|
||||
|
||||
return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, is_fallback, face_n);
|
||||
return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, is_fallback, face_n, hinting, flags);
|
||||
}
|
||||
|
||||
S32 LLFontGL::getNumFaces(const std::string& filename)
|
||||
|
||||
@@ -87,7 +87,7 @@ public:
|
||||
|
||||
void destroyGL();
|
||||
|
||||
bool loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n);
|
||||
bool loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags);
|
||||
|
||||
S32 getNumFaces(const std::string& filename);
|
||||
S32 getCacheGeneration() const;
|
||||
|
||||
@@ -181,16 +181,16 @@ LLFontDescriptor LLFontDescriptor::normalize() const
|
||||
return LLFontDescriptor(new_name,new_size,new_style, getFontFiles(), getFontCollectionFiles());
|
||||
}
|
||||
|
||||
void LLFontDescriptor::addFontFile(const std::string& file_name, const std::string& char_functor)
|
||||
void LLFontDescriptor::addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor)
|
||||
{
|
||||
char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor);
|
||||
mFontFiles.push_back(LLFontFileInfo(file_name, (mCharFunctors.end() != it) ? it->second : nullptr));
|
||||
mFontFiles.push_back(LLFontFileInfo(file_name, hinting, flags, (mCharFunctors.end() != it) ? it->second : nullptr));
|
||||
}
|
||||
|
||||
void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, const std::string& char_functor)
|
||||
void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor)
|
||||
{
|
||||
char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor);
|
||||
mFontCollectionFiles.push_back(LLFontFileInfo(file_name, (mCharFunctors.end() != it) ? it->second : nullptr));
|
||||
mFontCollectionFiles.push_back(LLFontFileInfo(file_name, hinting, flags, (mCharFunctors.end() != it) ? it->second : nullptr));
|
||||
}
|
||||
|
||||
LLFontRegistry::LLFontRegistry(bool create_gl_textures)
|
||||
@@ -289,23 +289,57 @@ bool font_desc_init_from_xml(LLXMLNodePtr node, LLFontDescriptor& desc)
|
||||
{
|
||||
std::string font_file_name = child->getTextContents();
|
||||
std::string char_functor;
|
||||
EFontHinting hinting = EFontHinting::FORCE_AUTOHINT;
|
||||
S32 flags = 0;
|
||||
|
||||
if (child->hasAttribute("functor"))
|
||||
{
|
||||
child->getAttributeString("functor", char_functor);
|
||||
}
|
||||
|
||||
if (child->hasAttribute("font_hinting"))
|
||||
{
|
||||
std::string attr_hinting;
|
||||
child->getAttributeString("font_hinting", attr_hinting);
|
||||
LLStringUtil::toLower(attr_hinting);
|
||||
|
||||
if (attr_hinting == "default")
|
||||
{
|
||||
hinting = EFontHinting::DEFAULT;
|
||||
}
|
||||
else if (attr_hinting == "force_auto")
|
||||
{
|
||||
hinting = EFontHinting::FORCE_AUTOHINT;
|
||||
}
|
||||
else if (attr_hinting == "no_hinting")
|
||||
{
|
||||
hinting = EFontHinting::NO_HINTING;
|
||||
}
|
||||
}
|
||||
|
||||
if (child->hasAttribute("flags"))
|
||||
{
|
||||
std::string attr_flags;
|
||||
child->getAttributeString("flags", attr_flags);
|
||||
LLStringUtil::toLower(attr_flags);
|
||||
|
||||
if (attr_flags == "bold")
|
||||
{
|
||||
flags |= LLFontGL::BOLD;
|
||||
}
|
||||
}
|
||||
|
||||
if (child->hasAttribute("load_collection"))
|
||||
{
|
||||
bool col = false;
|
||||
child->getAttributeBOOL("load_collection", col);
|
||||
if (col)
|
||||
{
|
||||
desc.addFontCollectionFile(font_file_name, char_functor);
|
||||
desc.addFontCollectionFile(font_file_name, hinting, flags, char_functor);
|
||||
}
|
||||
}
|
||||
|
||||
desc.addFontFile(font_file_name, char_functor);
|
||||
desc.addFontFile(font_file_name, hinting, flags, char_functor);
|
||||
}
|
||||
else if (child->hasName("os"))
|
||||
{
|
||||
@@ -462,7 +496,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
|
||||
// Add ultimate fallback list - generated dynamically on linux,
|
||||
// null elsewhere.
|
||||
std::transform(getUltimateFallbackList().begin(), getUltimateFallbackList().end(), std::back_inserter(font_files),
|
||||
[](const std::string& file_name) { return LLFontFileInfo(file_name); });
|
||||
[](const std::string& file_name) { return LLFontFileInfo(file_name, EFontHinting::FORCE_AUTOHINT, 0); });
|
||||
|
||||
// Load fonts based on names.
|
||||
if (font_files.empty())
|
||||
@@ -518,7 +552,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
|
||||
fontp = new LLFontGL;
|
||||
}
|
||||
if (fontp->loadFace(font_path, point_size_scale,
|
||||
LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i))
|
||||
LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i, font_file_it->mHinting, font_file_it->mFlags))
|
||||
{
|
||||
is_font_loaded = true;
|
||||
if (is_first_found)
|
||||
|
||||
@@ -34,22 +34,35 @@ class LLFontGL;
|
||||
|
||||
typedef std::vector<std::string> string_vec_t;
|
||||
|
||||
enum class EFontHinting : S32
|
||||
{
|
||||
DEFAULT = 0,
|
||||
NO_HINTING = 0x8000U,
|
||||
FORCE_AUTOHINT = 0x20,
|
||||
};
|
||||
|
||||
struct LLFontFileInfo
|
||||
{
|
||||
LLFontFileInfo(const std::string& file_name, const std::function<bool(llwchar)>& char_functor = nullptr)
|
||||
LLFontFileInfo(const std::string& file_name, EFontHinting hinting, S32 flags, const std::function<bool(llwchar)>& char_functor = nullptr)
|
||||
: FileName(file_name)
|
||||
, CharFunctor(char_functor)
|
||||
, mHinting(hinting)
|
||||
, mFlags(flags)
|
||||
{
|
||||
}
|
||||
|
||||
LLFontFileInfo(const LLFontFileInfo& ffi)
|
||||
LLFontFileInfo(const LLFontFileInfo& ffi, EFontHinting hinting, S32 flags)
|
||||
: FileName(ffi.FileName)
|
||||
, CharFunctor(ffi.CharFunctor)
|
||||
, mHinting(hinting)
|
||||
, mFlags(flags)
|
||||
{
|
||||
}
|
||||
|
||||
std::string FileName;
|
||||
std::function<bool(llwchar)> CharFunctor;
|
||||
EFontHinting mHinting;
|
||||
S32 mFlags;
|
||||
};
|
||||
typedef std::vector<LLFontFileInfo> font_file_info_vec_t;
|
||||
|
||||
@@ -71,10 +84,10 @@ public:
|
||||
const std::string& getSize() const { return mSize; }
|
||||
void setSize(const std::string& size) { mSize = size; }
|
||||
|
||||
void addFontFile(const std::string& file_name, const std::string& char_functor = LLStringUtil::null);
|
||||
void addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor = LLStringUtil::null);
|
||||
const font_file_info_vec_t & getFontFiles() const { return mFontFiles; }
|
||||
void setFontFiles(const font_file_info_vec_t& font_files) { mFontFiles = font_files; }
|
||||
void addFontCollectionFile(const std::string& file_name, const std::string& char_functor = LLStringUtil::null);
|
||||
void addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor = LLStringUtil::null);
|
||||
const font_file_info_vec_t& getFontCollectionFiles() const { return mFontCollectionFiles; }
|
||||
void setFontCollectionFiles(const font_file_info_vec_t& font_collection_files) { mFontCollectionFiles = font_collection_files; }
|
||||
|
||||
|
||||
@@ -159,9 +159,11 @@ LLFolderViewItem::Params::Params()
|
||||
icon_width("icon_width", 0),
|
||||
text_pad("text_pad", 0),
|
||||
text_pad_right("text_pad_right", 0),
|
||||
text_pad_top("text_pad_top", 1),
|
||||
single_folder_mode("single_folder_mode", false),
|
||||
double_click_override("double_click_override", false),
|
||||
arrow_size("arrow_size", 0),
|
||||
arrow_pad_top("arrow_pad_top", 1),
|
||||
max_folder_item_overlap("max_folder_item_overlap", 0)
|
||||
{ }
|
||||
|
||||
@@ -201,7 +203,9 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
|
||||
mIconWidth(p.icon_width),
|
||||
mTextPad(p.text_pad),
|
||||
mTextPadRight(p.text_pad_right),
|
||||
mTextPadTop(p.text_pad_top),
|
||||
mArrowSize(p.arrow_size),
|
||||
mArrowPadTop(p.arrow_pad_top),
|
||||
mSingleFolderMode(p.single_folder_mode),
|
||||
mMaxFolderItemOverlap(p.max_folder_item_overlap),
|
||||
mDoubleClickOverride(p.double_click_override)
|
||||
@@ -811,7 +815,7 @@ void LLFolderViewItem::drawOpenFolderArrow()
|
||||
if (hasVisibleChildren() || !isFolderComplete())
|
||||
{
|
||||
gl_draw_scaled_rotated_image(
|
||||
mIndentation, getRect().getHeight() - mArrowSize - mTextPad - sTopPad,
|
||||
mIndentation, getRect().getHeight() - mArrowSize - mArrowPadTop - sTopPad,
|
||||
mArrowSize, mArrowSize, mControlLabelRotation, sFolderArrowImg->getImage(), sFgColor);
|
||||
}
|
||||
}
|
||||
@@ -1045,7 +1049,7 @@ void LLFolderViewItem::draw()
|
||||
|
||||
S32 filter_string_length = mViewModelItem->hasFilterStringMatch() ? (S32)mViewModelItem->getFilterStringSize() : 0;
|
||||
F32 right_x = 0;
|
||||
F32 y = (F32)rect_height - line_height - (F32)mTextPad - (F32)sTopPad;
|
||||
F32 y = (F32)rect_height - line_height - (F32)mTextPadTop - (F32)sTopPad;
|
||||
F32 text_left = (F32)getLabelXPos();
|
||||
LLWString combined_string = mLabel + mLabelSuffix;
|
||||
|
||||
@@ -1124,7 +1128,7 @@ void LLFolderViewItem::draw()
|
||||
if(mLabelSuffix.empty() || (font == sSuffixFont))
|
||||
{
|
||||
F32 match_string_left = text_left + font->getWidthF32(combined_string.c_str(), 0, filter_offset + filter_string_length) - font->getWidthF32(combined_string.c_str(), filter_offset, filter_string_length);
|
||||
F32 yy = (F32)rect_height - line_height - (F32)mTextPad - (F32)sTopPad;
|
||||
F32 yy = (F32)rect_height - line_height - (F32)mTextPadTop - (F32)sTopPad;
|
||||
font->render(combined_string, filter_offset, match_string_left, yy,
|
||||
sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
|
||||
filter_string_length, S32_MAX, &right_x);
|
||||
@@ -1135,7 +1139,7 @@ void LLFolderViewItem::draw()
|
||||
if(label_filter_length > 0)
|
||||
{
|
||||
F32 match_string_left = text_left + font->getWidthF32(mLabel.c_str(), 0, filter_offset + label_filter_length) - font->getWidthF32(mLabel.c_str(), filter_offset, label_filter_length);
|
||||
F32 yy = (F32)rect_height - line_height - (F32)mTextPad - (F32)sTopPad;
|
||||
F32 yy = (F32)rect_height - line_height - (F32)mTextPadTop - (F32)sTopPad;
|
||||
font->render(mLabel, filter_offset, match_string_left, yy,
|
||||
sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
|
||||
label_filter_length, S32_MAX, &right_x);
|
||||
@@ -1146,7 +1150,7 @@ void LLFolderViewItem::draw()
|
||||
{
|
||||
S32 suffix_offset = llmax(0, filter_offset - (S32)mLabel.size());
|
||||
F32 match_string_left = text_left + font->getWidthF32(mLabel.c_str(), 0, static_cast<S32>(mLabel.size())) + sSuffixFont->getWidthF32(mLabelSuffix.c_str(), 0, suffix_offset + suffix_filter_length) - sSuffixFont->getWidthF32(mLabelSuffix.c_str(), suffix_offset, suffix_filter_length);
|
||||
F32 yy = (F32)rect_height - sSuffixFont->getLineHeight() - (F32)mTextPad - (F32)sTopPad;
|
||||
F32 yy = (F32)rect_height - sSuffixFont->getLineHeight() - (F32)mTextPadTop - (F32)sTopPad;
|
||||
sSuffixFont->render(mLabelSuffix, suffix_offset, match_string_left, yy, sFilterTextColor,
|
||||
LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
|
||||
suffix_filter_length, S32_MAX, &right_x);
|
||||
|
||||
@@ -73,7 +73,9 @@ public:
|
||||
icon_width,
|
||||
text_pad,
|
||||
text_pad_right,
|
||||
text_pad_top,
|
||||
arrow_size,
|
||||
arrow_pad_top,
|
||||
max_folder_item_overlap;
|
||||
Optional<bool> single_folder_mode,
|
||||
double_click_override;
|
||||
@@ -117,7 +119,9 @@ protected:
|
||||
mIconWidth,
|
||||
mTextPad,
|
||||
mTextPadRight,
|
||||
mTextPadTop,
|
||||
mArrowSize,
|
||||
mArrowPadTop,
|
||||
mMaxFolderItemOverlap;
|
||||
|
||||
F32 mControlLabelRotation;
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<fonts>
|
||||
|
||||
<font name="default" comment="default font files (global fallbacks)">
|
||||
<file>DejaVuSans.ttf</file>
|
||||
<font
|
||||
name="default"
|
||||
comment="default font files (global fallbacks)">
|
||||
<file load_collection="true" font_hinting="default">Inter_18pt-Regular.ttf</file>
|
||||
<file functor="is_emoji">TwemojiSVG.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>meiryo.TTC</file>
|
||||
@@ -31,9 +33,10 @@
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="SansSerifBold"
|
||||
comment="Name of bold sans-serif font">
|
||||
<file>DejaVuSans-Bold.ttf</file>
|
||||
<font
|
||||
name="SansSerifBold"
|
||||
comment="Name of bold sans-serif font">
|
||||
<file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-SemiBold.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>arialbd.ttf</file>
|
||||
</os>
|
||||
@@ -42,8 +45,10 @@
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
|
||||
<file>DejaVuSans.ttf</file>
|
||||
<font
|
||||
name="SansSerif"
|
||||
comment="Name of san-serif font (Truetype file name)">
|
||||
<file load_collection="true" font_hinting="default">Inter_18pt-Regular.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>arial.ttf</file>
|
||||
</os>
|
||||
@@ -52,31 +57,35 @@
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="SansSerif"
|
||||
comment="Name of bold sans-serif font"
|
||||
font_style="BOLD">
|
||||
<file>DejaVuSans-Bold.ttf</file>
|
||||
<font
|
||||
name="SansSerif"
|
||||
comment="Name of bold sans-serif font"
|
||||
font_style="BOLD">
|
||||
<file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-SemiBold.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="SansSerif"
|
||||
comment="Name of italic sans-serif font"
|
||||
font_style="ITALIC">
|
||||
<file>DejaVuSans-Oblique.ttf</file>
|
||||
<font
|
||||
name="SansSerif"
|
||||
comment="Name of italic sans-serif font"
|
||||
font_style="ITALIC">
|
||||
<file load_collection="true">Inter_18pt-Italic.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="SansSerif"
|
||||
comment="Name of bold italic sans-serif font"
|
||||
font_style="BOLD|ITALIC">
|
||||
<file>DejaVuSans-BoldOblique.ttf</file>
|
||||
<font
|
||||
name="SansSerif"
|
||||
comment="Name of bold italic sans-serif font"
|
||||
font_style="BOLD|ITALIC">
|
||||
<file load_collection="true">Inter_18pt-BoldItalic.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="Emoji"
|
||||
comment="Name of emoji font">
|
||||
<file>TwemojiSVG.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="Monospace"
|
||||
comment="Name of monospace font">
|
||||
|
||||
<font
|
||||
name="Monospace"
|
||||
comment="Name of monospace font">
|
||||
<file>DejaVuSansMono.ttf</file>
|
||||
</font>
|
||||
|
||||
@@ -103,9 +112,10 @@
|
||||
<file>DejaVuSans-BoldOblique.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="Helvetica"
|
||||
comment="Name of Helvetica font">
|
||||
<file>DejaVuSans.ttf</file>
|
||||
<font
|
||||
name="Helvetica"
|
||||
comment="Name of Helvetica font">
|
||||
<file font_hinting="default">Inter_18pt-Regular.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>arial.ttf</file>
|
||||
</os>
|
||||
@@ -114,10 +124,11 @@
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="Helvetica"
|
||||
comment="Name of Helvetica font (bold)"
|
||||
font_style="BOLD">
|
||||
<file>DejaVuSans-Bold.ttf</file>
|
||||
<font
|
||||
name="Helvetica"
|
||||
comment="Name of Helvetica font (bold)"
|
||||
font_style="BOLD">
|
||||
<file font_hinting="default" flags="bold">Inter_18pt-SemiBold.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>arialbd.ttf</file>
|
||||
</os>
|
||||
@@ -126,10 +137,11 @@
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="Helvetica"
|
||||
comment="Name of Helvetica font (italic)"
|
||||
font_style="ITALIC">
|
||||
<file>DejaVuSans-Oblique.ttf</file>
|
||||
<font
|
||||
name="Helvetica"
|
||||
comment="Name of Helvetica font (italic)"
|
||||
font_style="ITALIC">
|
||||
<file>Inter_18pt-Italic.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>ariali.ttf</file>
|
||||
</os>
|
||||
@@ -138,10 +150,11 @@
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="Helvetica"
|
||||
comment="Name of Helvetica font (bold italic)"
|
||||
font_style="BOLD|ITALIC">
|
||||
<file>DejaVuSans-BoldOblique.ttf</file>
|
||||
<font
|
||||
name="Helvetica"
|
||||
comment="Name of Helvetica font (bold italic)"
|
||||
font_style="BOLD|ITALIC">
|
||||
<file>Inter_18pt-BoldItalic.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>arialbi.ttf</file>
|
||||
</os>
|
||||
@@ -150,10 +163,11 @@
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="OverrideTest"
|
||||
comment="Name of font to test overriding">
|
||||
<font
|
||||
name="OverrideTest"
|
||||
comment="Name of font to test overriding">
|
||||
<file>times.ttf</file>
|
||||
<file>DejaVuSans.ttf</file>
|
||||
<file font_hinting="default">Inter_18pt-Regular.ttf</file>
|
||||
</font>
|
||||
|
||||
<font_size name="Monospace"
|
||||
@@ -166,15 +180,15 @@
|
||||
/>
|
||||
<font_size name="Large"
|
||||
comment="Size of large font (points, or 1/72 of an inch)"
|
||||
size="10.6"
|
||||
size="11.0"
|
||||
/>
|
||||
<font_size name="Medium"
|
||||
comment="Size of medium font (points, or 1/72 of an inch)"
|
||||
size="8.6"
|
||||
size="9"
|
||||
/>
|
||||
<font_size name="Small"
|
||||
comment="Size of small font (points, or 1/72 of an inch)"
|
||||
size="7.6"
|
||||
size="8"
|
||||
/>
|
||||
<font_size name="SmallLSL"
|
||||
comment="Size of small font for LSL editor (points, or 1/72 of an inch)"
|
||||
|
||||
@@ -14,5 +14,7 @@
|
||||
icon_width="16"
|
||||
text_pad="1"
|
||||
text_pad_right="4"
|
||||
text_pad_top="1"
|
||||
arrow_size="12"
|
||||
arrow_pad_top="1"
|
||||
max_folder_item_overlap="2"/>
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
<fonts>
|
||||
<font name="default" comment="default font files (global fallbacks)">
|
||||
<file>
|
||||
NotoSansCJKjp-Medium.otf
|
||||
</file>
|
||||
<file>
|
||||
DejaVuSans.ttf
|
||||
NotoSansCJKjp-SemiBold.otf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default">
|
||||
Inter_18pt-Regular.ttf
|
||||
</file>
|
||||
<os name="Windows">
|
||||
<file load_collection="true">
|
||||
YuGothM.ttc
|
||||
@@ -41,7 +41,7 @@
|
||||
</os>
|
||||
<os name="Mac">
|
||||
<file>
|
||||
YuGothic-Medium.otf
|
||||
YuGothic-SemiBold.otf
|
||||
</file>
|
||||
<file>
|
||||
ヒラギノ角ゴシック W3.ttc
|
||||
@@ -82,9 +82,9 @@
|
||||
<file>
|
||||
NotoSansCJKjp-Bold.otf
|
||||
</file>
|
||||
<file>
|
||||
DejaVuSans-Bold.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default" flags="bold">
|
||||
Inter_18pt-SemiBold.ttf
|
||||
</file>
|
||||
<os name="Windows">
|
||||
<file load_collection="true">
|
||||
YuGothB.ttc
|
||||
@@ -106,9 +106,9 @@
|
||||
<file>
|
||||
NotoSansCJKjp-Bold.otf
|
||||
</file>
|
||||
<file>
|
||||
DejaVuSans.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default">
|
||||
Inter_18pt-Regular.ttf
|
||||
</file>
|
||||
<os name="Windows">
|
||||
<file>
|
||||
arial.ttf
|
||||
@@ -121,19 +121,19 @@
|
||||
</os>
|
||||
</font>
|
||||
<font name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD">
|
||||
<file>
|
||||
DejaVuSans-Bold.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default" flags="bold">
|
||||
Inter_18pt-SemiBold.ttf
|
||||
</file>
|
||||
</font>
|
||||
<font name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC">
|
||||
<file>
|
||||
DejaVuSans-Oblique.ttf
|
||||
</file>
|
||||
<file load_collection="true">
|
||||
Inter_18pt-Italic.ttf
|
||||
</file>
|
||||
</font>
|
||||
<font name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC">
|
||||
<file>
|
||||
DejaVuSans-BoldOblique.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default" flags="bold">
|
||||
Inter_18pt-SemiBoldItalic.ttf
|
||||
</file>
|
||||
</font>
|
||||
<font name="Monospace" comment="Name of monospace font">
|
||||
<file>
|
||||
@@ -144,29 +144,29 @@
|
||||
</file>
|
||||
</font>
|
||||
<font name="DejaVu" comment="Name of DejaVu font">
|
||||
<file>
|
||||
DejaVuSans.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default">
|
||||
Inter_18pt-Regular.ttf
|
||||
</file>
|
||||
</font>
|
||||
<font name="DejaVu" comment="Name of DejaVu font (bold)" font_style="BOLD">
|
||||
<file>
|
||||
DejaVuSans-Bold.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="force_auto" flags="bold">
|
||||
Inter_18pt-SemiBold.ttf
|
||||
</file>
|
||||
</font>
|
||||
<font name="DejaVu" comment="Name of DejaVu font (italic)" font_style="ITALIC">
|
||||
<file>
|
||||
DejaVuSans-Oblique.ttf
|
||||
</file>
|
||||
<file load_collection="true">
|
||||
Inter_18pt-Italic.ttf
|
||||
</file>
|
||||
</font>
|
||||
<font name="DejaVu" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC">
|
||||
<file>
|
||||
DejaVuSans-BoldOblique.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default" flags="bold">
|
||||
Inter_18pt-SemiBoldItalic.ttf
|
||||
</file>
|
||||
</font>
|
||||
<font name="Helvetica" comment="Name of Helvetica font">
|
||||
<file>
|
||||
DejaVuSans.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default">
|
||||
Inter_18pt-Regular.ttf
|
||||
</file>
|
||||
<os name="Windows">
|
||||
<file>
|
||||
arial.ttf
|
||||
@@ -179,9 +179,9 @@
|
||||
</os>
|
||||
</font>
|
||||
<font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD">
|
||||
<file>
|
||||
DejaVuSans-Bold.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default" flags="bold">
|
||||
Inter_18pt-SemiBold.ttf
|
||||
</file>
|
||||
<os name="Windows">
|
||||
<file>
|
||||
arialbd.ttf
|
||||
@@ -194,9 +194,9 @@
|
||||
</os>
|
||||
</font>
|
||||
<font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC">
|
||||
<file>
|
||||
DejaVuSans-Oblique.ttf
|
||||
</file>
|
||||
<file load_collection="true">
|
||||
Inter_18pt-Italic.ttf
|
||||
</file>
|
||||
<os name="Windows">
|
||||
<file>
|
||||
ariali.ttf
|
||||
@@ -209,9 +209,9 @@
|
||||
</os>
|
||||
</font>
|
||||
<font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC">
|
||||
<file>
|
||||
DejaVuSans-BoldOblique.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default" flags="bold">
|
||||
Inter_18pt-SemiBoldItalic.ttf
|
||||
</file>
|
||||
<os name="Windows">
|
||||
<file>
|
||||
arialbi.ttf
|
||||
@@ -227,13 +227,13 @@
|
||||
<file>
|
||||
times.ttf
|
||||
</file>
|
||||
<file>
|
||||
DejaVuSans.ttf
|
||||
</file>
|
||||
<file load_collection="true" font_hinting="default">
|
||||
Inter_18pt-Regular.ttf
|
||||
</file>
|
||||
</font>
|
||||
<font_size name="Monospace" comment="Size for monospaced font (points, or 1/72 of an inch)" size="8.0"/>
|
||||
<font_size name="Huge" comment="Size of huge font (points, or 1/72 of an inch)" size="16.0"/>
|
||||
<font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" size="10.6"/>
|
||||
<font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" size="8.6"/>
|
||||
<font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" size="7.6"/>
|
||||
<font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" size="11"/>
|
||||
<font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" size="9"/>
|
||||
<font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" size="8"/>
|
||||
</fonts>
|
||||
|
||||
Reference in New Issue
Block a user