mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Warnings: Always supply all field initialisers

Browse source 
This also fixes an issue where the requested font style could be
incorrectly overwritten.
This commit is contained in:
reuk 2022-04-11 12:22:44 +01:00
parent 6de457f932
commit 3bf635e004
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
4 changed files with 43 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/juce_graphics/contexts/juce_GraphicsContext.cpp
View file

@ -86,7 +86,7 @@ namespace
return iter;
}
auto result = cache.emplace (std::move (args), CachedGlyphArrangement { configureArrangement (args) }).first;
auto result = cache.emplace (std::move (args), CachedGlyphArrangement { configureArrangement (args), {} }).first;
cacheOrder.push_front (result);
return result;
}();
@ -397,7 +397,7 @@ void Graphics::drawMultiLineText (const String& text, const int startX,
arrangement.addJustifiedText (args.font, args.text,
(float) args.startX, (float) args.baselineY, (float) args.maximumLineWidth,
args.justification, args.leading);
return ConfiguredArrangement { std::move (arrangement) };
return ConfiguredArrangement { std::move (arrangement), {} };
};
GlyphArrangementCache<ArrangementArgs>::getInstance()->draw (*this,
@ -432,7 +432,7 @@ void Graphics::drawText (const String& text, Rectangle<float> area,
arrangement.justifyGlyphs (0, arrangement.getNumGlyphs(),
args.area.getX(), args.area.getY(), args.area.getWidth(), args.area.getHeight(),
args.justificationType);
return ConfiguredArrangement { std::move (arrangement) };
return ConfiguredArrangement { std::move (arrangement), {} };
};
GlyphArrangementCache<ArrangementArgs>::getInstance()->draw (*this,
@ -482,7 +482,7 @@ void Graphics::drawFittedText (const String& text, Rectangle<int> area,
args.justification,
args.maximumNumberOfLines,
args.minimumHorizontalScale);
return ConfiguredArrangement { std::move (arrangement) };
return ConfiguredArrangement { std::move (arrangement), {} };
};
GlyphArrangementCache<ArrangementArgs>::getInstance()->draw (*this,