Skip to content

Commit eaadb59

Browse files
authored
Merge pull request #117433 from bruvzg/ac212_46
[4.6] Update access-kit to 0.21.2
2 parents 773450d + 7b4b294 commit eaadb59

23 files changed

+1008
-438
lines changed

.github/workflows/linux_builds.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
SCONS_FLAGS: >-
99
dev_mode=yes
1010
module_text_server_fb_enabled=yes
11-
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.18.0/"
11+
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/"
1212
GODOT_CPP_BRANCH: 4.5
1313
DOTNET_NOLOGO: true
1414
DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -161,13 +161,13 @@ jobs:
161161
- name: Download pre-built AccessKit
162162
uses: dsaltares/fetch-gh-release-asset@1.1.2
163163
with:
164-
repo: AccessKit/accesskit-c
165-
version: tags/0.18.0
166-
file: accesskit-c-0.18.0.zip
167-
target: accesskit-c-0.18.0/accesskit_c.zip
164+
repo: godotengine/godot-accesskit-c-static
165+
version: tags/0.21.2
166+
file: accesskit-c-0.21.2.zip
167+
target: accesskit-c-0.21.2/accesskit_c.zip
168168

169169
- name: Extract pre-built AccessKit
170-
run: unzip -o accesskit-c-0.18.0/accesskit_c.zip
170+
run: unzip -o accesskit-c-0.21.2/accesskit_c.zip
171171

172172
- name: Install mold linker
173173
if: matrix.proj-test

.github/workflows/macos_builds.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
SCONS_FLAGS: >-
99
dev_mode=yes
1010
module_text_server_fb_enabled=yes
11-
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.18.0/"
11+
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/"
1212
1313
jobs:
1414
build-macos:
@@ -53,13 +53,13 @@ jobs:
5353
- name: Download pre-built AccessKit
5454
uses: dsaltares/fetch-gh-release-asset@1.1.2
5555
with:
56-
repo: AccessKit/accesskit-c
57-
version: tags/0.18.0
58-
file: accesskit-c-0.18.0.zip
59-
target: accesskit-c-0.18.0/accesskit_c.zip
56+
repo: godotengine/godot-accesskit-c-static
57+
version: tags/0.21.2
58+
file: accesskit-c-0.21.2.zip
59+
target: accesskit-c-0.21.2/accesskit_c.zip
6060

6161
- name: Extract pre-built AccessKit
62-
run: unzip -o accesskit-c-0.18.0/accesskit_c.zip
62+
run: unzip -o accesskit-c-0.21.2/accesskit_c.zip
6363

6464
- name: Setup Vulkan SDK
6565
id: vulkan-sdk

.github/workflows/windows_builds.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
module_text_server_fb_enabled=yes
1111
debug_symbols=no
1212
"angle_libs=${{ github.workspace }}/"
13-
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.18.0/"
13+
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/"
1414
SCONS_CACHE_MSVC_CONFIG: true
1515
PYTHONIOENCODING: utf8
1616

@@ -98,13 +98,13 @@ jobs:
9898
- name: Download pre-built AccessKit
9999
uses: dsaltares/fetch-gh-release-asset@1.1.2
100100
with:
101-
repo: AccessKit/accesskit-c
102-
version: tags/0.18.0
103-
file: accesskit-c-0.18.0.zip
104-
target: accesskit-c-0.18.0/accesskit_c.zip
101+
repo: godotengine/godot-accesskit-c-static
102+
version: tags/0.21.2
103+
file: accesskit-c-0.21.2.zip
104+
target: accesskit-c-0.21.2/accesskit_c.zip
105105

106106
- name: Extract pre-built AccessKit
107-
run: unzip -o accesskit-c-0.18.0/accesskit_c.zip
107+
run: unzip -o accesskit-c-0.21.2/accesskit_c.zip
108108

109109
- name: Compilation
110110
uses: ./.github/actions/godot-build

doc/classes/TextServer.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,6 +1269,14 @@
12691269
Returns the font size of the [param index] text run (in visual order).
12701270
</description>
12711271
</method>
1272+
<method name="shaped_get_run_glyph_range" qualifiers="const">
1273+
<return type="Vector2i" />
1274+
<param index="0" name="shaped" type="RID" />
1275+
<param index="1" name="index" type="int" />
1276+
<description>
1277+
Returns the glyph range of the [param index] text run (in visual order).
1278+
</description>
1279+
</method>
12721280
<method name="shaped_get_run_language" qualifiers="const">
12731281
<return type="String" />
12741282
<param index="0" name="shaped" type="RID" />

doc/classes/TextServerExtension.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,6 +1241,14 @@
12411241
Returns the font size of the [param index] text run (in visual order).
12421242
</description>
12431243
</method>
1244+
<method name="_shaped_get_run_glyph_range" qualifiers="virtual const">
1245+
<return type="Vector2i" />
1246+
<param index="0" name="shaped" type="RID" />
1247+
<param index="1" name="index" type="int" />
1248+
<description>
1249+
Returns the glyph range of the [param index] text run (in visual order).
1250+
</description>
1251+
</method>
12441252
<method name="_shaped_get_run_language" qualifiers="virtual const">
12451253
<return type="String" />
12461254
<param index="0" name="shaped" type="RID" />

0 commit comments

Comments
 (0)