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

Move ShapedText to the detail namespace and expose it in the headers

Browse source 
This makes it accessible for the new TextEditor implementation in
juce_gui_basics.
This commit is contained in:
attila 2025-03-13 09:58:14 +01:00 • committed by Attila Szarvas
parent e31fb368b6
commit 1b595311d0
39 changed files with 891 additions and 607 deletions
Download patch file Download diff file Expand all files Collapse all files

18
examples/DemoRunner/Builds/Android/app/CMakeLists.txt
View file

@ -1480,8 +1480,14 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
"../../../../../modules/juce_graphics/detail/juce_Ranges.h"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.h"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.h"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"
"../../../../../modules/juce_graphics/effects/juce_GlowEffect.cpp"
@ -1850,10 +1856,7 @@ 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_JustifiedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
"../../../../../modules/juce_graphics/fonts/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
@ -4081,8 +4084,14 @@ set_source_files_properties(
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
"../../../../../modules/juce_graphics/detail/juce_Ranges.h"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.h"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.h"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"
"../../../../../modules/juce_graphics/effects/juce_GlowEffect.cpp"
@ -4451,10 +4460,7 @@ 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_JustifiedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
"../../../../../modules/juce_graphics/fonts/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"

21
examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj
View file

@ -1902,9 +1902,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2157,15 +2166,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -4043,7 +4043,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters
View file

@ -2671,9 +2671,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -2926,15 +2935,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -6531,9 +6531,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

21
examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj
View file

@ -1902,9 +1902,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2157,15 +2166,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -4043,7 +4043,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters
View file

@ -2671,9 +2671,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -2926,15 +2935,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -6531,9 +6531,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

18
extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
View file

@ -1242,8 +1242,14 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
"../../../../../modules/juce_graphics/detail/juce_Ranges.h"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.h"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.h"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"
"../../../../../modules/juce_graphics/effects/juce_GlowEffect.cpp"
@ -1612,10 +1618,7 @@ 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_JustifiedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
"../../../../../modules/juce_graphics/fonts/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
@ -3503,8 +3506,14 @@ set_source_files_properties(
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
"../../../../../modules/juce_graphics/detail/juce_Ranges.h"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.h"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.h"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"
"../../../../../modules/juce_graphics/effects/juce_GlowEffect.cpp"
@ -3873,10 +3882,7 @@ 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_JustifiedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
"../../../../../modules/juce_graphics/fonts/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"

21
extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj
View file

@ -1595,9 +1595,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -1850,15 +1859,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -3498,7 +3498,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters
View file

@ -2188,9 +2188,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -2443,15 +2452,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -5541,9 +5541,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

18
extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
View file

@ -1372,8 +1372,14 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
"../../../../../modules/juce_graphics/detail/juce_Ranges.h"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.h"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.h"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"
"../../../../../modules/juce_graphics/effects/juce_GlowEffect.cpp"
@ -1742,10 +1748,7 @@ 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_JustifiedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
"../../../../../modules/juce_graphics/fonts/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
@ -3786,8 +3789,14 @@ set_source_files_properties(
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
"../../../../../modules/juce_graphics/detail/juce_Ranges.h"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.h"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.h"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"
"../../../../../modules/juce_graphics/effects/juce_GlowEffect.cpp"
@ -4156,10 +4165,7 @@ 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_JustifiedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
"../../../../../modules/juce_graphics/fonts/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"

21
extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj
View file

@ -1729,9 +1729,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -1984,15 +1993,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -3731,7 +3731,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters
View file

@ -2395,9 +2395,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -2650,15 +2659,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -5976,9 +5976,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

21
extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj
View file

@ -1729,9 +1729,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -1984,15 +1993,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -3731,7 +3731,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters
View file

@ -2395,9 +2395,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -2650,15 +2659,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -5976,9 +5976,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

18
extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
View file

@ -1261,8 +1261,14 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
"../../../../../modules/juce_graphics/detail/juce_Ranges.h"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.h"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.h"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"
"../../../../../modules/juce_graphics/effects/juce_GlowEffect.cpp"
@ -1631,10 +1637,7 @@ 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_JustifiedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
"../../../../../modules/juce_graphics/fonts/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
@ -3602,8 +3605,14 @@ set_source_files_properties(
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
"../../../../../modules/juce_graphics/detail/juce_Ranges.h"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_ShapedText.h"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_SimpleShapedText.h"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"
"../../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"
"../../../../../modules/juce_graphics/effects/juce_GlowEffect.cpp"
@ -3972,10 +3981,7 @@ 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_JustifiedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
"../../../../../modules/juce_graphics/fonts/juce_ShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_SimpleShapedText.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"

21
extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj
View file

@ -1616,9 +1616,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -1871,15 +1880,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -3596,7 +3596,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters
View file

@ -2242,9 +2242,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -2497,15 +2506,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -5703,9 +5703,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

21
extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj
View file

@ -758,9 +758,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -1013,15 +1022,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2296,7 +2296,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters
View file

@ -1081,9 +1081,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -1336,15 +1345,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -3345,9 +3345,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

21
extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj
View file

@ -758,9 +758,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -1013,15 +1022,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2296,7 +2296,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters
View file

@ -1081,9 +1081,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -1336,15 +1345,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -3345,9 +3345,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

21
extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj
View file

@ -1737,9 +1737,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -1992,15 +2001,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -3843,7 +3843,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters
View file

@ -2443,9 +2443,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -2698,15 +2707,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -6135,9 +6135,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

21
extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj
View file

@ -1737,9 +1737,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -1992,15 +2001,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -3843,7 +3843,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters
View file

@ -2443,9 +2443,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -2698,15 +2707,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -6135,9 +6135,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

21
extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj
View file

@ -1615,9 +1615,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -1870,15 +1879,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -3572,7 +3572,10 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_GlowEffect.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_ImageEffectFilter.h"/>

27
extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters
View file

@ -2239,9 +2239,18 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.cpp">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.cpp">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClCompile>
@ -2494,15 +2503,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_JustifiedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_ShapedText.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_SimpleShapedText.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>
@ -5670,9 +5670,18 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_SimpleShapedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\effects\juce_DropShadowEffect.h">
<Filter>JUCE Modules\juce_graphics\effects</Filter>
</ClInclude>

110
modules/juce_graphics/fonts/juce_JustifiedText.cpp → modules/juce_graphics/detail/juce_JustifiedText.cpp
View file

@ -32,62 +32,9 @@
==============================================================================
*/
namespace juce
namespace juce::detail
{
template <size_t StartingAt, typename Tuple, size_t... Is>
constexpr auto partiallyUnpackImpl (Tuple&& tuple, std::index_sequence<Is...>)
{
return std::tie (std::get<StartingAt + Is> (tuple)...);
}
template <size_t StartingAt, size_t NumElems, typename Tuple>
constexpr auto partiallyUnpack (Tuple&& tuple)
{
return partiallyUnpackImpl<StartingAt> (std::forward<Tuple> (tuple), std::make_index_sequence<NumElems>{});
}
class JustifiedText
{
private:
enum class DrawType
{
normal,
ellipsis
};
public:
JustifiedText (const SimpleShapedText& t, const ShapedTextOptions& options);
template <typename Callable, typename... RangedValues>
void accessTogetherWith (Callable&& callback, RangedValues&&... rangedValues) const;
/* The callback receives (Span<const ShapedGlyph> glyphs,
Span<Point<float>> positions,
Font font,
Range<int64> glyphRange,
int64 lineNumber) // So far this has been indexed from 0 per SimpleShapedText
// object, but maybe we'll find we want global text level
// line numbers, so only assume they are increasing by one
*/
template <typename Callable>
void access (Callable&& callback) const;
/* This is how much cumulative widths glyphs take up in each line. Whether the trailing
whitespace is included depends on the ShapedTextOptions::getWhitespaceShouldFitInLine()
setting.
*/
auto& getMinimumRequiredWidthForLines() const { return minimumRequiredWidthsForLine; }
private:
const SimpleShapedText& shapedText;
detail::RangedValues<Point<float>> lineAnchors;
std::optional<SimpleShapedText> ellipsis;
detail::RangedValues<DrawType> rangesToDraw;
detail::RangedValues<float> whitespaceStretch;
std::vector<float> minimumRequiredWidthsForLine;
};
void drawJustifiedText (const JustifiedText& text, const Graphics& g, AffineTransform);
//==============================================================================
@ -496,59 +443,6 @@ JustifiedText::JustifiedText (const SimpleShapedText& t, const ShapedTextOptions
realign.extraWhitespaceAdvance);
}
template <typename Callable, typename... RangedValues>
void JustifiedText::accessTogetherWith (Callable&& callback, RangedValues&&... rangedValues) const
{
std::optional<int64> lastLine;
Point<float> anchor{};
for (const auto item : makeIntersectingRangedValues (&shapedText.getLineNumbers(),
&shapedText.getResolvedFonts(),
&lineAnchors,
&rangesToDraw,
&whitespaceStretch,
(&rangedValues)...))
{
const auto& [range, line, font, lineAnchor, drawType, stretch] = partiallyUnpack<0, 6> (item);
const auto& rest = partiallyUnpack<6, std::tuple_size_v<decltype(item)> - 6> (item);
if (std::exchange (lastLine, line) != line)
anchor = lineAnchor;
const auto glyphs = [this, r = range, dt = drawType]() -> Span<const ShapedGlyph>
{
if (dt == DrawType::ellipsis)
return ellipsis->getGlyphs();
return shapedText.getGlyphs (r);
}();
std::vector<Point<float>> positions (glyphs.size());
std::transform (glyphs.begin(), glyphs.end(), positions.begin(), [&anchor, &s = stretch] (auto& glyph)
{
auto result = anchor + glyph.offset;
anchor += glyph.advance;
if (glyph.whitespace)
anchor.addXY (s, 0.0f);
return result;
});
const auto callbackFont = drawType == DrawType::ellipsis ? ellipsis->getResolvedFonts().front().value : font;
const auto callbackParameters = std::tuple_cat (std::tie (glyphs, positions, callbackFont, range, line), rest);
const auto invokeNullChecked = [&] (auto&... params)
{
NullCheckedInvocation::invoke (callback, params...);
};
std::apply (invokeNullChecked, callbackParameters);
}
}
template <typename Callable>
void JustifiedText::access (Callable&& callback) const
{
@ -577,4 +471,4 @@ void drawJustifiedText (const JustifiedText& text, const Graphics& g, AffineTran
});
}
} // namespace juce
} // namespace juce::detail

144
modules/juce_graphics/detail/juce_JustifiedText.h Normal file
View file

@ -0,0 +1,144 @@
/*
==============================================================================
This file is part of the JUCE framework.
Copyright (c) Raw Material Software Limited
JUCE is an open source framework subject to commercial or open source
licensing.
By downloading, installing, or using the JUCE framework, or combining the
JUCE framework with any other source code, object code, content or any other
copyrightable work, you agree to the terms of the JUCE End User Licence
Agreement, and all incorporated terms including the JUCE Privacy Policy and
the JUCE Website Terms of Service, as applicable, which will bind you. If you
do not agree to the terms of these agreements, we will not license the JUCE
framework to you, and you must discontinue the installation or download
process and cease use of the JUCE framework.
JUCE End User Licence Agreement: https://juce.com/legal/juce-8-licence/
JUCE Privacy Policy: https://juce.com/juce-privacy-policy
JUCE Website Terms of Service: https://juce.com/juce-website-terms-of-service/
Or:
You may also use this code under the terms of the AGPLv3:
https://www.gnu.org/licenses/agpl-3.0.en.html
THE JUCE FRAMEWORK IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL
WARRANTIES, WHETHER EXPRESSED OR IMPLIED, INCLUDING WARRANTY OF
MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED.
==============================================================================
*/
namespace juce::detail
{
template <size_t StartingAt, typename Tuple, size_t... Is>
constexpr auto partiallyUnpackImpl (Tuple&& tuple, std::index_sequence<Is...>)
{
return std::tie (std::get<StartingAt + Is> (tuple)...);
}
template <size_t StartingAt, size_t NumElems, typename Tuple>
constexpr auto partiallyUnpack (Tuple&& tuple)
{
return partiallyUnpackImpl<StartingAt> (std::forward<Tuple> (tuple), std::make_index_sequence<NumElems>{});
}
class JustifiedText
{
private:
enum class DrawType
{
normal,
ellipsis
};
public:
JustifiedText (const SimpleShapedText& t, const ShapedTextOptions& options);
template <typename Callable, typename... RangedValues>
void accessTogetherWith (Callable&& callback, RangedValues&&... rangedValues) const
{
std::optional<int64> lastLine;
Point<float> anchor {};
for (const auto item : makeIntersectingRangedValues (&shapedText.getLineNumbers(),
&shapedText.getResolvedFonts(),
&lineAnchors,
&rangesToDraw,
&whitespaceStretch,
(&rangedValues)...))
{
const auto& [range, line, font, lineAnchor, drawType, stretch] = partiallyUnpack<0, 6> (item);
const auto& rest = partiallyUnpack<6, std::tuple_size_v<decltype (item)> - 6> (item);
if (std::exchange (lastLine, line) != line)
anchor = lineAnchor;
const auto glyphs = [this, r = range, dt = drawType]() -> Span<const ShapedGlyph>
{
if (dt == DrawType::ellipsis)
return ellipsis->getGlyphs();
return shapedText.getGlyphs (r);
}();
std::vector<Point<float>> positions (glyphs.size());
std::transform (glyphs.begin(),
glyphs.end(),
positions.begin(),
[&anchor, &s = stretch] (auto& glyph)
{
auto result = anchor + glyph.offset;
anchor += glyph.advance;
if (glyph.whitespace)
anchor.addXY (s, 0.0f);
return result;
});
const auto callbackFont =
drawType == DrawType::ellipsis ? ellipsis->getResolvedFonts().front().value : font;
const auto callbackParameters =
std::tuple_cat (std::tie (glyphs, positions, callbackFont, range, line), rest);
const auto invokeNullChecked = [&] (auto&... params)
{ NullCheckedInvocation::invoke (callback, params...); };
std::apply (invokeNullChecked, callbackParameters);
}
}
/* The callback receives (Span<const ShapedGlyph> glyphs,
Span<Point<float>> positions,
Font font,
Range<int64> glyphRange,
int64 lineNumber) // So far this has been indexed from 0 per SimpleShapedText
// object, but maybe we'll find we want global text level
// line numbers, so only assume they are increasing by one
*/
template <typename Callable>
void access (Callable&& callback) const;
/* This is how much cumulative widths glyphs take up in each line. Whether the trailing
whitespace is included depends on the ShapedTextOptions::getWhitespaceShouldFitInLine()
setting.
*/
auto& getMinimumRequiredWidthForLines() const { return minimumRequiredWidthsForLine; }
private:
const SimpleShapedText& shapedText;
detail::RangedValues<Point<float>> lineAnchors;
std::optional<SimpleShapedText> ellipsis;
detail::RangedValues<DrawType> rangesToDraw;
detail::RangedValues<float> whitespaceStretch;
std::vector<float> minimumRequiredWidthsForLine;
};
} // namespace juce::detail

70
modules/juce_graphics/fonts/juce_ShapedText.cpp → modules/juce_graphics/detail/juce_ShapedText.cpp
View file

@ -32,75 +32,9 @@
==============================================================================
*/
namespace juce
namespace juce::detail
{
/** Class that can visually shape a Unicode string provided a list of Fonts corresponding to
sub-ranges of the string.
*/
class JUCE_API ShapedText
{
public:
using Options = ShapedTextOptions;
ShapedText();
explicit ShapedText (String text);
ShapedText (String text, Options options);
/** Returns the text which was used to construct this object. */
const String& getText() const;
/** Returns the text's codepoint range, to which the glyph under the provided index belongs.
This range will have a length of at least one, and potentially more than one if ligatures
are enabled.
*/
Range<int64> getTextRange (int64 glyphIndex) const;
/** Returns the widths for each line, that the glyphs would require to be rendered without being
truncated. This will or will not include the space required by trailing whitespaces in the
line based on the ShapedTextOptions::withTrailingWhitespacesShouldFit() value.
This value isn't affected by the Justification parameter, it just reports the amount of
width that would be required to avoid truncation.
*/
Span<const float> getMinimumRequiredWidthForLines() const;
/** Provides access to the data stored in the ShapedText.
The provided function callback will be called multiple times for "uniform glyph runs", for which all
callback parameters are the same.
Between each subsequent callback at least one of the provided parameters will be different.
The callbacks happen in visual order i.e. left to right, which is irrespective of the
underlying text's writing direction.
The callback parameters in order are:
- the glyphs
- the positions for each glyph in the previous parameter
- the Font with which these glyphs should be rendered
- the range in all glyphs this ShapedText object holds, that correspond to the current glyphs
- a line number which increases by one for each new line
*/
void access (const std::function<void (Span<const ShapedGlyph>, Span<Point<float>>, Font, Range<int64>, int64)>&) const;
/** Draws the text. */
void draw (const Graphics& g, AffineTransform transform) const;
/** @internal */
class Detail;
/** @internal */
Detail getDetail() const;
private:
class Impl;
std::shared_ptr<Impl> impl;
};
class ShapedText::Impl
{
public:
@ -205,4 +139,4 @@ ShapedText::Detail ShapedText::getDetail() const
return Detail { this };
}
} // namespace juce
} // namespace juce::detail

104
modules/juce_graphics/detail/juce_ShapedText.h Normal file
View file

@ -0,0 +1,104 @@
/*
==============================================================================
This file is part of the JUCE framework.
Copyright (c) Raw Material Software Limited
JUCE is an open source framework subject to commercial or open source
licensing.
By downloading, installing, or using the JUCE framework, or combining the
JUCE framework with any other source code, object code, content or any other
copyrightable work, you agree to the terms of the JUCE End User Licence
Agreement, and all incorporated terms including the JUCE Privacy Policy and
the JUCE Website Terms of Service, as applicable, which will bind you. If you
do not agree to the terms of these agreements, we will not license the JUCE
framework to you, and you must discontinue the installation or download
process and cease use of the JUCE framework.
JUCE End User Licence Agreement: https://juce.com/legal/juce-8-licence/
JUCE Privacy Policy: https://juce.com/juce-privacy-policy
JUCE Website Terms of Service: https://juce.com/juce-website-terms-of-service/
Or:
You may also use this code under the terms of the AGPLv3:
https://www.gnu.org/licenses/agpl-3.0.en.html
THE JUCE FRAMEWORK IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL
WARRANTIES, WHETHER EXPRESSED OR IMPLIED, INCLUDING WARRANTY OF
MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED.
==============================================================================
*/
namespace juce::detail
{
/** Class that can visually shape a Unicode string provided a list of Fonts corresponding to
sub-ranges of the string.
*/
class JUCE_API ShapedText
{
public:
using Options = ShapedTextOptions;
ShapedText();
explicit ShapedText (String text);
ShapedText (String text, Options options);
/** Returns the text which was used to construct this object. */
const String& getText() const;
/** Returns the text's codepoint range, to which the glyph under the provided index belongs.
This range will have a length of at least one, and potentially more than one if ligatures
are enabled.
*/
Range<int64> getTextRange (int64 glyphIndex) const;
/** Returns the widths for each line, that the glyphs would require to be rendered without being
truncated. This will or will not include the space required by trailing whitespaces in the
line based on the ShapedTextOptions::withTrailingWhitespacesShouldFit() value.
This value isn't affected by the Justification parameter, it just reports the amount of
width that would be required to avoid truncation.
*/
Span<const float> getMinimumRequiredWidthForLines() const;
/** Provides access to the data stored in the ShapedText.
The provided function callback will be called multiple times for "uniform glyph runs", for which all
callback parameters are the same.
Between each subsequent callback at least one of the provided parameters will be different.
The callbacks happen in visual order i.e. left to right, which is irrespective of the
underlying text's writing direction.
The callback parameters in order are:
- the glyphs
- the positions for each glyph in the previous parameter
- the Font with which these glyphs should be rendered
- the range in all glyphs this ShapedText object holds, that correspond to the current glyphs
- a line number which increases by one for each new line
*/
void access (const std::function<void (Span<const ShapedGlyph>, Span<Point<float>>, Font, Range<int64>, int64)>&) const;
/** Draws the text. */
void draw (const Graphics& g, AffineTransform transform) const;
/** @internal */
class Detail;
/** @internal */
Detail getDetail() const;
private:
class Impl;
std::shared_ptr<Impl> impl;
};
} // namespace juce::detail

184
modules/juce_graphics/fonts/juce_SimpleShapedText.cpp → modules/juce_graphics/detail/juce_SimpleShapedText.cpp
View file

@ -32,190 +32,10 @@
==============================================================================
*/
namespace juce
namespace juce::detail
{
using FontForRange = std::pair<Range<int64>, Font>;
class ShapedTextOptions
{
public:
[[nodiscard]] ShapedTextOptions withJustification (Justification x) const
{
return withMember (*this, &ShapedTextOptions::justification, x);
}
[[nodiscard]] ShapedTextOptions withMaxWidth (float x) const
{
return withMember (*this, &ShapedTextOptions::maxWidth, x);
}
[[nodiscard]] ShapedTextOptions withHeight (float x) const
{
return withMember (*this, &ShapedTextOptions::height, x);
}
[[nodiscard]] ShapedTextOptions withFont (Font x) const
{
return withMember (*this, &ShapedTextOptions::fontsForRange,
std::vector<FontForRange> { { { 0, std::numeric_limits<int64>::max() },
x } });
}
[[nodiscard]] ShapedTextOptions withFontsForRange (const std::vector<FontForRange>& x) const
{
return withMember (*this, &ShapedTextOptions::fontsForRange, x);
}
[[nodiscard]] ShapedTextOptions withLanguage (StringRef x) const
{
return withMember (*this, &ShapedTextOptions::language, x);
}
[[nodiscard]] ShapedTextOptions withFirstLineIndent (float x) const
{
return withMember (*this, &ShapedTextOptions::firstLineIndent, x);
}
/* This controls the space between lines using a proportional value, with a default of 1.0,
meaning single line spacing i.e. the descender of the current line + ascender of the next
line. This value is multiplied by the leading provided here.
*/
[[nodiscard]] ShapedTextOptions withLeading (float x) const
{
return withMember (*this, &ShapedTextOptions::leading, x);
}
/* This controls the space between lines using an additive absolute value, with a default of 0.0.
This value is added to the spacing between each two lines.
*/
[[nodiscard]] ShapedTextOptions withAdditiveLineSpacing (float x) const
{
return withMember (*this, &ShapedTextOptions::additiveLineSpacing, x);
}
[[nodiscard]] ShapedTextOptions withBaselineAtZero (bool x = true) const
{
return withMember (*this, &ShapedTextOptions::baselineAtZero, x);
}
[[nodiscard]] ShapedTextOptions withTrailingWhitespacesShouldFit (bool x = true) const
{
return withMember (*this, &ShapedTextOptions::trailingWhitespacesShouldFit, x);
}
[[nodiscard]] ShapedTextOptions withMaxNumLines (int64 x) const
{
return withMember (*this, &ShapedTextOptions::maxNumLines, x);
}
[[nodiscard]] ShapedTextOptions withEllipsis (String x = String::charToString ((juce_wchar) 0x2026)) const
{
return withMember (*this, &ShapedTextOptions::ellipsis, std::move (x));
}
[[nodiscard]] ShapedTextOptions withReadingDirection (std::optional<TextDirection> x) const
{
return withMember (*this, &ShapedTextOptions::readingDir, x);
}
[[nodiscard]] ShapedTextOptions withAllowBreakingInsideWord (bool x = true) const
{
return withMember (*this, &ShapedTextOptions::allowBreakingInsideWord, x);
}
const auto& getReadingDirection() const { return readingDir; }
const auto& getJustification() const { return justification; }
const auto& getMaxWidth() const { return maxWidth; }
const auto& getHeight() const { return height; }
const auto& getFontsForRange() const { return fontsForRange; }
const auto& getLanguage() const { return language; }
const auto& getFirstLineIndent() const { return firstLineIndent; }
const auto& getLeading() const { return leading; }
const auto& getAdditiveLineSpacing() const { return additiveLineSpacing; }
const auto& isBaselineAtZero() const { return baselineAtZero; }
const auto& getTrailingWhitespacesShouldFit() const { return trailingWhitespacesShouldFit; }
const auto& getMaxNumLines() const { return maxNumLines; }
const auto& getEllipsis() const { return ellipsis; }
const auto& getAllowBreakingInsideWord() const { return allowBreakingInsideWord; }
private:
Justification justification { Justification::topLeft };
std::optional<TextDirection> readingDir;
std::optional<float> maxWidth;
std::optional<float> height;
std::vector<FontForRange> fontsForRange { { { 0, std::numeric_limits<int64>::max() },
FontOptions { 15.0f } } };
String language = SystemStats::getDisplayLanguage();
float firstLineIndent = 0.0f;
float leading = 1.0f;
float additiveLineSpacing = 0.0f;
bool baselineAtZero = false;
bool allowBreakingInsideWord = false;
bool trailingWhitespacesShouldFit;
int64 maxNumLines = std::numeric_limits<int64>::max();
String ellipsis;
};
struct ShapedGlyph
{
uint32_t glyphId;
int64 cluster;
bool unsafeToBreak;
bool whitespace;
Point<float> advance;
Point<float> offset;
};
struct GlyphLookupEntry
{
Range<int64> glyphRange;
bool ltr = true;
};
class SimpleShapedText
{
public:
/* Shapes and lays out the first contiguous sequence of ranges specified in the fonts
parameter.
*/
SimpleShapedText (const String* data,
const ShapedTextOptions& options);
/* The returned container associates line numbers with the range of glyphs (not input codepoints)
that make up the line.
*/
const auto& getLineNumbers() const { return lineNumbers; }
const auto& getResolvedFonts() const { return resolvedFonts; }
Range<int64> getTextRange (int64 glyphIndex) const;
int64 getNumLines() const { return (int64) lineNumbers.getRanges().size(); }
int64 getNumGlyphs() const { return (int64) glyphsInVisualOrder.size(); }
juce_wchar getCodepoint (int64 glyphIndex) const;
Span<const ShapedGlyph> getGlyphs (Range<int64> glyphRange) const;
Span<const ShapedGlyph> getGlyphs() const;
private:
void shape (const String& data,
const ShapedTextOptions& options);
const String& string;
std::vector<ShapedGlyph> glyphsInVisualOrder;
detail::RangedValues<int64> lineNumbers;
detail::RangedValues<Font> resolvedFonts;
detail::RangedValues<GlyphLookupEntry> glyphLookup;
JUCE_LEAK_DETECTOR (SimpleShapedText)
};
//==============================================================================
using namespace detail;
constexpr hb_script_t getScriptTag (TextScript type)
{
JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wswitch-enum")
@ -1541,4 +1361,4 @@ static SimpleShapedTextTests simpleShapedTextTests;
#endif
} // namespace juce
} // namespace juce::detail

223
modules/juce_graphics/detail/juce_SimpleShapedText.h Normal file
View file

@ -0,0 +1,223 @@
/*
==============================================================================
This file is part of the JUCE framework.
Copyright (c) Raw Material Software Limited
JUCE is an open source framework subject to commercial or open source
licensing.
By downloading, installing, or using the JUCE framework, or combining the
JUCE framework with any other source code, object code, content or any other
copyrightable work, you agree to the terms of the JUCE End User Licence
Agreement, and all incorporated terms including the JUCE Privacy Policy and
the JUCE Website Terms of Service, as applicable, which will bind you. If you
do not agree to the terms of these agreements, we will not license the JUCE
framework to you, and you must discontinue the installation or download
process and cease use of the JUCE framework.
JUCE End User Licence Agreement: https://juce.com/legal/juce-8-licence/
JUCE Privacy Policy: https://juce.com/juce-privacy-policy
JUCE Website Terms of Service: https://juce.com/juce-website-terms-of-service/
Or:
You may also use this code under the terms of the AGPLv3:
https://www.gnu.org/licenses/agpl-3.0.en.html
THE JUCE FRAMEWORK IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL
WARRANTIES, WHETHER EXPRESSED OR IMPLIED, INCLUDING WARRANTY OF
MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED.
==============================================================================
*/
namespace juce::detail
{
using FontForRange = std::pair<Range<int64>, Font>;
/** Types of text direction. This may also be applied to characters. */
enum class TextDirection
{
ltr, // This text reads left to right.
rtl // This text reads right to left.
};
class ShapedTextOptions
{
public:
[[nodiscard]] ShapedTextOptions withJustification (Justification x) const
{
return withMember (*this, &ShapedTextOptions::justification, x);
}
[[nodiscard]] ShapedTextOptions withMaxWidth (float x) const
{
return withMember (*this, &ShapedTextOptions::maxWidth, x);
}
[[nodiscard]] ShapedTextOptions withHeight (float x) const
{
return withMember (*this, &ShapedTextOptions::height, x);
}
[[nodiscard]] ShapedTextOptions withFont (Font x) const
{
return withMember (*this, &ShapedTextOptions::fontsForRange,
std::vector<FontForRange> { { { 0, std::numeric_limits<int64>::max() },
x } });
}
[[nodiscard]] ShapedTextOptions withFontsForRange (const std::vector<FontForRange>& x) const
{
return withMember (*this, &ShapedTextOptions::fontsForRange, x);
}
[[nodiscard]] ShapedTextOptions withLanguage (StringRef x) const
{
return withMember (*this, &ShapedTextOptions::language, x);
}
[[nodiscard]] ShapedTextOptions withFirstLineIndent (float x) const
{
return withMember (*this, &ShapedTextOptions::firstLineIndent, x);
}
/* This controls the space between lines using a proportional value, with a default of 1.0,
meaning single line spacing i.e. the descender of the current line + ascender of the next
line. This value is multiplied by the leading provided here.
*/
[[nodiscard]] ShapedTextOptions withLeading (float x) const
{
return withMember (*this, &ShapedTextOptions::leading, x);
}
/* This controls the space between lines using an additive absolute value, with a default of 0.0.
This value is added to the spacing between each two lines.
*/
[[nodiscard]] ShapedTextOptions withAdditiveLineSpacing (float x) const
{
return withMember (*this, &ShapedTextOptions::additiveLineSpacing, x);
}
[[nodiscard]] ShapedTextOptions withBaselineAtZero (bool x = true) const
{
return withMember (*this, &ShapedTextOptions::baselineAtZero, x);
}
[[nodiscard]] ShapedTextOptions withTrailingWhitespacesShouldFit (bool x = true) const
{
return withMember (*this, &ShapedTextOptions::trailingWhitespacesShouldFit, x);
}
[[nodiscard]] ShapedTextOptions withMaxNumLines (int64 x) const
{
return withMember (*this, &ShapedTextOptions::maxNumLines, x);
}
[[nodiscard]] ShapedTextOptions withEllipsis (String x = String::charToString ((juce_wchar) 0x2026)) const
{
return withMember (*this, &ShapedTextOptions::ellipsis, std::move (x));
}
[[nodiscard]] ShapedTextOptions withReadingDirection (std::optional<TextDirection> x) const
{
return withMember (*this, &ShapedTextOptions::readingDir, x);
}
[[nodiscard]] ShapedTextOptions withAllowBreakingInsideWord (bool x = true) const
{
return withMember (*this, &ShapedTextOptions::allowBreakingInsideWord, x);
}
const auto& getReadingDirection() const { return readingDir; }
const auto& getJustification() const { return justification; }
const auto& getMaxWidth() const { return maxWidth; }
const auto& getHeight() const { return height; }
const auto& getFontsForRange() const { return fontsForRange; }
const auto& getLanguage() const { return language; }
const auto& getFirstLineIndent() const { return firstLineIndent; }
const auto& getLeading() const { return leading; }
const auto& getAdditiveLineSpacing() const { return additiveLineSpacing; }
const auto& isBaselineAtZero() const { return baselineAtZero; }
const auto& getTrailingWhitespacesShouldFit() const { return trailingWhitespacesShouldFit; }
const auto& getMaxNumLines() const { return maxNumLines; }
const auto& getEllipsis() const { return ellipsis; }
const auto& getAllowBreakingInsideWord() const { return allowBreakingInsideWord; }
private:
Justification justification { Justification::topLeft };
std::optional<TextDirection> readingDir;
std::optional<float> maxWidth;
std::optional<float> height;
std::vector<FontForRange> fontsForRange { { { 0, std::numeric_limits<int64>::max() },
FontOptions { 15.0f } } };
String language = SystemStats::getDisplayLanguage();
float firstLineIndent = 0.0f;
float leading = 1.0f;
float additiveLineSpacing = 0.0f;
bool baselineAtZero = false;
bool allowBreakingInsideWord = false;
bool trailingWhitespacesShouldFit;
int64 maxNumLines = std::numeric_limits<int64>::max();
String ellipsis;
};
struct ShapedGlyph
{
uint32_t glyphId;
int64 cluster;
bool unsafeToBreak;
bool whitespace;
Point<float> advance;
Point<float> offset;
};
struct GlyphLookupEntry
{
Range<int64> glyphRange;
bool ltr = true;
};
class SimpleShapedText
{
public:
/* Shapes and lays out the first contiguous sequence of ranges specified in the fonts
parameter.
*/
SimpleShapedText (const String* data,
const ShapedTextOptions& options);
/* The returned container associates line numbers with the range of glyphs (not input codepoints)
that make up the line.
*/
const auto& getLineNumbers() const { return lineNumbers; }
const auto& getResolvedFonts() const { return resolvedFonts; }
Range<int64> getTextRange (int64 glyphIndex) const;
int64 getNumLines() const { return (int64) lineNumbers.getRanges().size(); }
int64 getNumGlyphs() const { return (int64) glyphsInVisualOrder.size(); }
juce_wchar getCodepoint (int64 glyphIndex) const;
Span<const ShapedGlyph> getGlyphs (Range<int64> glyphRange) const;
Span<const ShapedGlyph> getGlyphs() const;
private:
void shape (const String& data,
const ShapedTextOptions& options);
const String& string;
std::vector<ShapedGlyph> glyphsInVisualOrder;
detail::RangedValues<int64> lineNumbers;
detail::RangedValues<Font> resolvedFonts;
detail::RangedValues<GlyphLookupEntry> glyphLookup;
JUCE_LEAK_DETECTOR (SimpleShapedText)
};
} // namespace juce::detail

16
modules/juce_graphics/fonts/juce_GlyphArrangement.cpp
View file

@ -43,7 +43,7 @@ static constexpr bool isNonBreakingSpace (const juce_wchar c)
|| c == 0x2060;
}
static bool areAllRequiredWidthsSmallerThanMax (const ShapedText& shapedText, float width)
static bool areAllRequiredWidthsSmallerThanMax (const detail::ShapedText& shapedText, float width)
{
const auto lineWidths = shapedText.getMinimumRequiredWidthForLines();
return std::all_of (lineWidths.begin(), lineWidths.end(), [width] (auto& w) { return w <= width; });
@ -51,7 +51,7 @@ static bool areAllRequiredWidthsSmallerThanMax (const ShapedText& shapedText, fl
// ShapedText truncates the last line by default, even if it requires larger width than the maximum
// allowed.
static bool areAllRequiredWidthsExceptTheLastSmallerThanMax (const ShapedText& shapedText, float width)
static bool areAllRequiredWidthsExceptTheLastSmallerThanMax (const detail::ShapedText& shapedText, float width)
{
const auto lineWidths = shapedText.getMinimumRequiredWidthForLines();
@ -171,7 +171,7 @@ void GlyphArrangement::addLineOfText (const Font& font, const String& text, floa
addCurtailedLineOfText (font, text, xOffset, yOffset, 1.0e10f, false);
}
static void addGlyphsFromShapedText (GlyphArrangement& ga, const ShapedText& st, float x, float y)
static void addGlyphsFromShapedText (GlyphArrangement& ga, const detail::ShapedText& st, float x, float y)
{
st.access ([&] (auto shapedGlyphs, auto positions, auto font, auto glyphRange, auto)
{
@ -199,6 +199,8 @@ void GlyphArrangement::addCurtailedLineOfText (const Font& font, const String& t
float xOffset, float yOffset,
float maxWidthPixels, bool useEllipsis)
{
using namespace detail;
auto options = ShapedText::Options{}.withMaxNumLines (1)
.withMaxWidth (maxWidthPixels)
.withFont (font)
@ -218,6 +220,8 @@ void GlyphArrangement::addJustifiedText (const Font& font, const String& text,
Justification horizontalLayout,
float leading)
{
using namespace detail;
ShapedText st { text, ShapedText::Options{}.withMaxWidth (maxLineWidth)
.withJustification (horizontalLayout)
.withFont (font)
@ -235,8 +239,10 @@ static auto createFittedText (const Font& f,
Justification layout,
int maximumLines,
float minimumRelativeHorizontalScale,
ShapedText::Options baseOptions = {})
detail::ShapedText::Options baseOptions = {})
{
using namespace detail;
if (! layout.testFlags (Justification::bottom | Justification::top))
layout = layout.getOnlyHorizontalFlags() | Justification::verticallyCentred;
@ -472,7 +478,7 @@ void GlyphArrangement::addFittedText (const Font& f,
layout,
maximumLines,
minimumHorizontalScale,
ShapedText::Options{}.withAllowBreakingInsideWord());
detail::ShapedText::Options{}.withAllowBreakingInsideWord());
addGlyphsFromShapedText (*this, stWithWordBreaks, x, y);
}

22
modules/juce_graphics/fonts/juce_TextLayout.cpp
View file

@ -327,6 +327,8 @@ static auto castTo (const Range<U>& r)
static auto getFontsForRange (const detail::RangedValues<Font>& fonts)
{
using namespace detail;
std::vector<FontForRange> result;
result.reserve (fonts.size());
@ -340,7 +342,7 @@ static auto getFontsForRange (const detail::RangedValues<Font>& fonts)
return result;
}
static Range<int64> getInputRange (const ShapedText& st, Range<int64> glyphRange)
static Range<int64> getInputRange (const detail::ShapedText& st, Range<int64> glyphRange)
{
if (glyphRange.isEmpty())
{
@ -356,8 +358,10 @@ static Range<int64> getInputRange (const ShapedText& st, Range<int64> glyphRange
std::max (startInputRange.getEnd(), endInputRange.getEnd()) };
}
static Range<int64> getLineInputRange (const ShapedText& st, int64 lineNumber)
static Range<int64> getLineInputRange (const detail::ShapedText& st, int64 lineNumber)
{
using namespace detail;
return getInputRange (st, ShapedText::Detail { &st }.getSimpleShapedText()
.getLineNumbers()
.getItem ((size_t) lineNumber).range);
@ -368,10 +372,10 @@ struct MaxFontAscentAndDescent
float ascent{}, descent{};
};
static MaxFontAscentAndDescent getMaxFontAscentAndDescentInEnclosingLine (const ShapedText& st,
static MaxFontAscentAndDescent getMaxFontAscentAndDescentInEnclosingLine (const detail::ShapedText& st,
Range<int64> lineChunkRange)
{
const auto sst = ShapedText::Detail { &st }.getSimpleShapedText();
const auto sst = detail::ShapedText::Detail { &st }.getSimpleShapedText();
const auto lineRange = sst.getLineNumbers()
.getItemWithEnclosingRange (lineChunkRange.getStart())->range;
@ -389,8 +393,10 @@ static MaxFontAscentAndDescent getMaxFontAscentAndDescentInEnclosingLine (const
return result;
}
static std::optional<TextDirection> getTextDirection (const AttributedString& text)
static std::optional<detail::TextDirection> getTextDirection (const AttributedString& text)
{
using namespace detail;
using ReadingDirection = AttributedString::ReadingDirection;
const auto dir = text.getReadingDirection();
@ -406,8 +412,10 @@ static std::optional<TextDirection> getTextDirection (const AttributedString& te
void TextLayout::createStandardLayout (const AttributedString& text)
{
detail::RangedValues<Font> fonts;
detail::RangedValues<Colour> colours;
using namespace detail;
RangedValues<Font> fonts;
RangedValues<Colour> colours;
for (auto i = 0, iMax = text.getNumAttributes(); i < iMax; ++i)
{

6
modules/juce_graphics/juce_graphics.cpp
View file

@ -194,9 +194,9 @@ extern "C"
#include "fonts/juce_FontOptions.cpp"
#include "fonts/juce_Font.cpp"
#include "detail/juce_Ranges.cpp"
#include "fonts/juce_SimpleShapedText.cpp"
#include "fonts/juce_JustifiedText.cpp"
#include "fonts/juce_ShapedText.cpp"
#include "detail/juce_SimpleShapedText.cpp"
#include "detail/juce_JustifiedText.cpp"
#include "detail/juce_ShapedText.cpp"
#include "fonts/juce_GlyphArrangement.cpp"
#include "fonts/juce_TextLayout.cpp"
#include "effects/juce_DropShadowEffect.cpp"

3
modules/juce_graphics/juce_graphics.h
View file

@ -138,6 +138,9 @@ namespace juce
#include "fonts/juce_FontOptions.h"
#include "fonts/juce_Font.h"
#include "detail/juce_Ranges.h"
#include "detail/juce_SimpleShapedText.h"
#include "detail/juce_JustifiedText.h"
#include "detail/juce_ShapedText.h"
#include "fonts/juce_AttributedString.h"
#include "fonts/juce_GlyphArrangement.h"
#include "fonts/juce_TextLayout.h"

2
modules/juce_graphics/native/juce_CoreGraphicsContext_mac.mm
View file

@ -227,7 +227,7 @@ private:
if (filter == nullptr || context == nullptr)
return false;
const ImagePtr content { CGBitmapContextCreateImage (context.get()) };
const detail::ImagePtr content { CGBitmapContextCreateImage (context.get()) };
if (content == nullptr)
return false;

6
modules/juce_graphics/unicode/juce_UnicodeBidi.cpp
View file

@ -177,13 +177,13 @@ public:
return text.size();
}
BidiParagraph createParagraph (size_t offset, std::optional<TextDirection> d = {}) const
BidiParagraph createParagraph (size_t offset, std::optional<detail::TextDirection> d = {}) const
{
BidiParagraph::ParagraphPtr result { SBAlgorithmCreateParagraph (algorithm.get(), offset, text.size() - offset, [&]() -> SBLevel
{
if (! d.has_value())
return SBLevelDefaultLTR;
return *d == TextDirection::rtl ? 1 : 0;
return *d == detail::TextDirection::rtl ? 1 : 0;
}()) };
jassert (result != nullptr);
@ -192,7 +192,7 @@ public:
}
template <typename Fn>
void forEachParagraph (Fn&& callback, std::optional<TextDirection> dir = {}) const
void forEachParagraph (Fn&& callback, std::optional<detail::TextDirection> dir = {}) const
{
for (size_t i = 0; i < text.size();)
{

8
modules/juce_graphics/unicode/juce_UnicodeUtils.cpp
View file

@ -82,12 +82,4 @@ enum class TextBreakType
hard // The sequence of characters must be broken here.
};
/** Types of text direction. This may also be applied to characters. */
enum class TextDirection
{
ltr, // This text reads left to right.
rtl // This text reads right to left.
};
} // namespace juce