mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-09 23:34:20 +00:00
Move ShapedText to the detail namespace and expose it in the headers
This makes it accessible for the new TextEditor implementation in juce_gui_basics.
This commit is contained in:
parent
e31fb368b6
commit
1b595311d0
39 changed files with 891 additions and 607 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue