mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-09 23:34:20 +00:00
Add GlyphArrangementOptions for addFittedText and drawFittedText
The new options can be used to affect line spacing.
This commit is contained in:
parent
787f7a4694
commit
c61158ed3a
34 changed files with 323 additions and 13 deletions
|
|
@ -1857,6 +1857,8 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_graphics/fonts/juce_FunctionPointerDestructor.h"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.cpp"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.cpp"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.h"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
|
||||
|
|
@ -4513,6 +4515,8 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_graphics/fonts/juce_FunctionPointerDestructor.h"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.cpp"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.cpp"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.h"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
|
||||
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
|
||||
|
|
|
|||
|
|
@ -2169,6 +2169,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -4381,6 +4384,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FontOptions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
|
||||
|
|
|
|||
|
|
@ -2944,6 +2944,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.cpp">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -7455,6 +7458,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -2169,6 +2169,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
|
|
@ -4381,6 +4384,7 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FontOptions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
|
||||
|
|
|
|||
|
|
@ -2944,6 +2944,9 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.cpp">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -7455,6 +7458,9 @@
|
|||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
|
||||
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue