Skip to content

Commit b72343c

Browse files
committed
Fix font sizing with the software and OpenGL renderers when ascent override is used
1 parent 39ff0f9 commit b72343c

File tree

44 files changed

+158
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+158
-3
lines changed

examples/DemoRunner/Builds/Android/app/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,6 +1536,7 @@ add_library( ${BINARY_NAME}
15361536
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
15371537
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
15381538
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
1539+
"../../../../../modules/juce_graphics/detail/juce_FontRendering.h"
15391540
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
15401541
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
15411542
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
@@ -4256,6 +4257,7 @@ set_source_files_properties(
42564257
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
42574258
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
42584259
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
4260+
"../../../../../modules/juce_graphics/detail/juce_FontRendering.h"
42594261
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
42604262
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
42614263
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"

examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4192,6 +4192,7 @@
41924192
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
41934193
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
41944194
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
4195+
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h"/>
41954196
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
41964197
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
41974198
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>

examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6783,6 +6783,9 @@
67836783
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
67846784
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
67856785
</ClInclude>
6786+
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
6787+
<Filter>JUCE Modules\juce_graphics\detail</Filter>
6788+
</ClInclude>
67866789
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
67876790
<Filter>JUCE Modules\juce_graphics\detail</Filter>
67886791
</ClInclude>

examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4192,6 +4192,7 @@
41924192
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
41934193
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
41944194
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
4195+
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h"/>
41954196
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
41964197
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
41974198
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>

examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6783,6 +6783,9 @@
67836783
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
67846784
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
67856785
</ClInclude>
6786+
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
6787+
<Filter>JUCE Modules\juce_graphics\detail</Filter>
6788+
</ClInclude>
67866789
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
67876790
<Filter>JUCE Modules\juce_graphics\detail</Filter>
67886791
</ClInclude>

examples/DemoRunner/Builds/VisualStudio2026/DemoRunner_App.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4192,6 +4192,7 @@
41924192
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
41934193
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
41944194
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
4195+
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h"/>
41954196
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
41964197
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
41974198
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>

examples/DemoRunner/Builds/VisualStudio2026/DemoRunner_App.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6783,6 +6783,9 @@
67836783
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
67846784
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
67856785
</ClInclude>
6786+
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
6787+
<Filter>JUCE Modules\juce_graphics\detail</Filter>
6788+
</ClInclude>
67866789
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
67876790
<Filter>JUCE Modules\juce_graphics\detail</Filter>
67886791
</ClInclude>

extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,6 +1298,7 @@ add_library( ${BINARY_NAME}
12981298
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
12991299
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
13001300
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
1301+
"../../../../../modules/juce_graphics/detail/juce_FontRendering.h"
13011302
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
13021303
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
13031304
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"
@@ -3632,6 +3633,7 @@ set_source_files_properties(
36323633
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"
36333634
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"
36343635
"../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
3636+
"../../../../../modules/juce_graphics/detail/juce_FontRendering.h"
36353637
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.cpp"
36363638
"../../../../../modules/juce_graphics/detail/juce_JustifiedText.h"
36373639
"../../../../../modules/juce_graphics/detail/juce_Ranges.cpp"

extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3605,6 +3605,7 @@
36053605
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_GraphicsContext.h"/>
36063606
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsContext.h"/>
36073607
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h"/>
3608+
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h"/>
36083609
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h"/>
36093610
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_Ranges.h"/>
36103611
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_ShapedText.h"/>

extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5742,6 +5742,9 @@
57425742
<ClInclude Include="..\..\..\..\modules\juce_graphics\contexts\juce_LowLevelGraphicsSoftwareRenderer.h">
57435743
<Filter>JUCE Modules\juce_graphics\contexts</Filter>
57445744
</ClInclude>
5745+
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_FontRendering.h">
5746+
<Filter>JUCE Modules\juce_graphics\detail</Filter>
5747+
</ClInclude>
57455748
<ClInclude Include="..\..\..\..\modules\juce_graphics\detail\juce_JustifiedText.h">
57465749
<Filter>JUCE Modules\juce_graphics\detail</Filter>
57475750
</ClInclude>

0 commit comments

Comments
 (0)