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

Fix font sizing with the software and OpenGL renderers when ascent override is used

Browse source
This commit is contained in:
attila 2025-10-15 17:07:05 +02:00 • committed by Attila Szarvas
parent 39ff0f91f4
commit b72343cf8c
44 changed files with 158 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1536,6 +1536,7 @@ 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_FontRendering.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
@ -4256,6 +4257,7 @@ 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_FontRendering.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"

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

@ -4192,6 +4192,7 @@
<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_FontRendering.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"/>

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

@ -6783,6 +6783,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

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

@ -4192,6 +4192,7 @@
<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_FontRendering.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"/>

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

@ -6783,6 +6783,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

1
examples/DemoRunner/Builds/VisualStudio2026/DemoRunner_App.vcxproj
View file

@ -4192,6 +4192,7 @@
<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_FontRendering.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"/>

3
examples/DemoRunner/Builds/VisualStudio2026/DemoRunner_App.vcxproj.filters
View file

@ -6783,6 +6783,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

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

@ -1298,6 +1298,7 @@ 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_FontRendering.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
@ -3632,6 +3633,7 @@ 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_FontRendering.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"

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

@ -3605,6 +3605,7 @@
<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_FontRendering.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"/>

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

@ -5742,6 +5742,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

1
extras/AudioPerformanceTest/Builds/VisualStudio2026/AudioPerformanceTest_App.vcxproj
View file

@ -3605,6 +3605,7 @@
<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_FontRendering.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"/>

3
extras/AudioPerformanceTest/Builds/VisualStudio2026/AudioPerformanceTest_App.vcxproj.filters
View file

@ -5742,6 +5742,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

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

@ -1428,6 +1428,7 @@ 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_FontRendering.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
@ -3915,6 +3916,7 @@ 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_FontRendering.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"

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

@ -3838,6 +3838,7 @@
<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_FontRendering.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"/>

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

@ -6177,6 +6177,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

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

@ -3838,6 +3838,7 @@
<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_FontRendering.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"/>

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

@ -6177,6 +6177,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

1
extras/AudioPluginHost/Builds/VisualStudio2026/AudioPluginHost_App.vcxproj
View file

@ -3838,6 +3838,7 @@
<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_FontRendering.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"/>

3
extras/AudioPluginHost/Builds/VisualStudio2026/AudioPluginHost_App.vcxproj.filters
View file

@ -6177,6 +6177,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

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

@ -1317,6 +1317,7 @@ 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_FontRendering.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
@ -3731,6 +3732,7 @@ 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_FontRendering.h"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"

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

@ -3703,6 +3703,7 @@
<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_FontRendering.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"/>

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

@ -5904,6 +5904,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

1
extras/NetworkGraphicsDemo/Builds/VisualStudio2026/NetworkGraphicsDemo_App.vcxproj
View file

@ -3703,6 +3703,7 @@
<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_FontRendering.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"/>

3
extras/NetworkGraphicsDemo/Builds/VisualStudio2026/NetworkGraphicsDemo_App.vcxproj.filters
View file

@ -5904,6 +5904,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

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

@ -2321,6 +2321,7 @@
<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_FontRendering.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"/>

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

@ -3378,6 +3378,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

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

@ -2321,6 +2321,7 @@
<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_FontRendering.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"/>

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

@ -3378,6 +3378,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

1
extras/Projucer/Builds/VisualStudio2026/Projucer_App.vcxproj
View file

@ -2321,6 +2321,7 @@
<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_FontRendering.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"/>

3
extras/Projucer/Builds/VisualStudio2026/Projucer_App.vcxproj.filters
View file

@ -3378,6 +3378,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

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

@ -3950,6 +3950,7 @@
<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_FontRendering.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"/>

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

@ -6336,6 +6336,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

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

@ -3950,6 +3950,7 @@
<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_FontRendering.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"/>

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

@ -6336,6 +6336,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

1
extras/UnitTestRunner/Builds/VisualStudio2026/UnitTestRunner_ConsoleApp.vcxproj
View file

@ -3950,6 +3950,7 @@
<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_FontRendering.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"/>

3
extras/UnitTestRunner/Builds/VisualStudio2026/UnitTestRunner_ConsoleApp.vcxproj.filters
View file

@ -6336,6 +6336,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

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

@ -3679,6 +3679,7 @@
<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_FontRendering.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"/>

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

@ -5871,6 +5871,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

1
extras/WindowsDLL/Builds/VisualStudio2026/WindowsDLL_DynamicLibrary.vcxproj
View file

@ -3679,6 +3679,7 @@
<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_FontRendering.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"/>

3
extras/WindowsDLL/Builds/VisualStudio2026/WindowsDLL_DynamicLibrary.vcxproj.filters
View file

@ -5871,6 +5871,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
<Filter>JUCE Modules\juce_graphics\detail</Filter>
</ClInclude>

67
modules/juce_graphics/detail/juce_FontRendering.h Normal file
View file

@ -0,0 +1,67 @@
/*
==============================================================================
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
{
struct FontRendering
{
FontRendering() = delete;
/*
Returns the total height of this font, in pixels, subject to the ascent and descent override
values.
If no ascent or descent override is set, this will return the same value as getHeight().
*/
static float getEffectiveHeight (const Font& font)
{
const auto ptr = font.getTypefacePtr();
if (ptr == nullptr)
return font.getHeight();
const auto original = ptr->getMetrics (font.getMetricsKind()).heightToPoints;
const auto actual = font.getHeightToPointsFactor();
const auto sanity = 1e-6 < original && original < 1e6 && actual < 1e6;
if (! sanity)
return font.getHeight();
return font.getHeight() * actual / original;
}
};
} // namespace juce::detail

9
modules/juce_graphics/fonts/juce_Font.h
View file

@ -659,12 +659,19 @@ public:
*/
Native getNativeDetails() const;
/* @internal
The factor by which a JUCE font height should be multiplied in order to convert to a font
size in points.
May be inf if the font ascent and descent overrides have both been set to 0!
*/
float getHeightToPointsFactor() const;
private:
//==============================================================================
static bool compare (const Font&, const Font&) noexcept;
void dupeInternalIfShared();
float getHeightToPointsFactor() const;
friend struct GraphicsFontHelpers;

1
modules/juce_graphics/juce_graphics.h
View file

@ -148,6 +148,7 @@ namespace juce
#include "fonts/juce_TextLayout.h"
#include "contexts/juce_LowLevelGraphicsContext.h"
#include "images/juce_ScaledImage.h"
#include "detail/juce_FontRendering.h"
#include "native/juce_RenderingHelpers.h"
#include "contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
#include "effects/juce_ImageEffectFilter.h"

4
modules/juce_graphics/native/juce_RenderingHelpers.h
View file

@ -203,7 +203,7 @@ public:
{
return cache.get (Key { font, glyphNumber }, [] (const auto& key)
{
auto fontHeight = key.font.getHeight();
auto fontHeight = detail::FontRendering::getEffectiveHeight (key.font);
auto typeface = key.font.getTypefacePtr();
return typeface->getLayersForGlyph (key.font.getMetricsKind(),
key.glyph,
@ -2660,7 +2660,7 @@ protected:
return std::tuple (cache.get (f, i), drawPos);
}
const auto fontHeight = stack->font.getHeight();
const auto fontHeight = detail::FontRendering::getEffectiveHeight (stack->font);
const auto fontTransform = AffineTransform::scale (fontHeight * stack->font.getHorizontalScale(),
fontHeight).followedBy (t);
const auto fullTransform = stack->transform.getTransformWith (fontTransform);