Skip to content

Commit f9313aa

Browse files
RepiteoRepiteo
committed
Merge pull request #108924 from bruvzg/ac17
Update access-kit to 0.17.0
2 parents 5787f6f + 3f757c4 commit f9313aa

File tree

14 files changed

+289
-50
lines changed

14 files changed

+289
-50
lines changed

‎.github/workflows/linux_builds.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
SCONS_FLAGS: >-
88
dev_mode=yes
99
module_text_server_fb_enabled=yes
10-
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.16.0/"
10+
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.17.0/"
1111
GODOT_CPP_BRANCH: 4.4
1212
DOTNET_NOLOGO: true
1313
DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -162,12 +162,12 @@ jobs:
162162
uses: dsaltares/[email protected]
163163
with:
164164
repo: AccessKit/accesskit-c
165-
version: tags/0.16.0
166-
file: accesskit-c-0.16.0.zip
167-
target: accesskit-c-0.16.0/accesskit_c.zip
165+
version: tags/0.17.0
166+
file: accesskit-c-0.17.0.zip
167+
target: accesskit-c-0.17.0/accesskit_c.zip
168168

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

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

‎.github/workflows/macos_builds.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
SCONS_FLAGS: >-
88
dev_mode=yes
99
module_text_server_fb_enabled=yes
10-
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.16.0/"
10+
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.17.0/"
1111
1212
jobs:
1313
build-macos:
@@ -51,12 +51,12 @@ jobs:
5151
uses: dsaltares/[email protected]
5252
with:
5353
repo: AccessKit/accesskit-c
54-
version: tags/0.16.0
55-
file: accesskit-c-0.16.0.zip
56-
target: accesskit-c-0.16.0/accesskit_c.zip
54+
version: tags/0.17.0
55+
file: accesskit-c-0.17.0.zip
56+
target: accesskit-c-0.17.0/accesskit_c.zip
5757

5858
- name: Extract pre-built AccessKit
59-
run: unzip -o accesskit-c-0.16.0/accesskit_c.zip
59+
run: unzip -o accesskit-c-0.17.0/accesskit_c.zip
6060

6161
- name: Setup Vulkan SDK
6262
id: vulkan-sdk

‎.github/workflows/windows_builds.yml‎

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

@@ -90,12 +90,12 @@ jobs:
9090
uses: dsaltares/[email protected]
9191
with:
9292
repo: AccessKit/accesskit-c
93-
version: tags/0.16.0
94-
file: accesskit-c-0.16.0.zip
95-
target: accesskit-c-0.16.0/accesskit_c.zip
93+
version: tags/0.17.0
94+
file: accesskit-c-0.17.0.zip
95+
target: accesskit-c-0.17.0/accesskit_c.zip
9696

9797
- name: Extract pre-built AccessKit
98-
run: unzip -o accesskit-c-0.16.0/accesskit_c.zip
98+
run: unzip -o accesskit-c-0.17.0/accesskit_c.zip
9999

100100
- name: Compilation
101101
uses: ./.github/actions/godot-build

‎doc/classes/DisplayServer.xml‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2833,22 +2833,22 @@
28332833
Scroll backward action, callback argument is not set.
28342834
</constant>
28352835
<constant name="ACTION_SCROLL_DOWN" value="12" enum="AccessibilityAction">
2836-
Scroll down action, callback argument is not set.
2836+
Scroll down action, callback argument is set to [enum AccessibilityScrollUnit].
28372837
</constant>
28382838
<constant name="ACTION_SCROLL_FORWARD" value="13" enum="AccessibilityAction">
28392839
Scroll forward action, callback argument is not set.
28402840
</constant>
28412841
<constant name="ACTION_SCROLL_LEFT" value="14" enum="AccessibilityAction">
2842-
Scroll left action, callback argument is not set.
2842+
Scroll left action, callback argument is set to [enum AccessibilityScrollUnit].
28432843
</constant>
28442844
<constant name="ACTION_SCROLL_RIGHT" value="15" enum="AccessibilityAction">
2845-
Scroll right action, callback argument is not set.
2845+
Scroll right action, callback argument is set to [enum AccessibilityScrollUnit].
28462846
</constant>
28472847
<constant name="ACTION_SCROLL_UP" value="16" enum="AccessibilityAction">
2848-
Scroll up action, callback argument is not set.
2848+
Scroll up action, callback argument is set to [enum AccessibilityScrollUnit].
28492849
</constant>
28502850
<constant name="ACTION_SCROLL_INTO_VIEW" value="17" enum="AccessibilityAction">
2851-
Scroll into view action, callback argument is not set.
2851+
Scroll into view action, callback argument is set to [enum AccessibilityScrollHint].
28522852
</constant>
28532853
<constant name="ACTION_SCROLL_TO_POINT" value="18" enum="AccessibilityAction">
28542854
Scroll to point action, callback argument is set to [Vector2] with the relative point coordinates.
@@ -2874,6 +2874,30 @@
28742874
<constant name="LIVE_ASSERTIVE" value="2" enum="AccessibilityLiveMode">
28752875
Indicates that updates to the live region have the highest priority and should be presented immediately.
28762876
</constant>
2877+
<constant name="SCROLL_UNIT_ITEM" value="0" enum="AccessibilityScrollUnit">
2878+
The amount by which to scroll. A single item of a list, line of text.
2879+
</constant>
2880+
<constant name="SCROLL_UNIT_PAGE" value="1" enum="AccessibilityScrollUnit">
2881+
The amount by which to scroll. A single page.
2882+
</constant>
2883+
<constant name="SCROLL_HINT_TOP_LEFT" value="0" enum="AccessibilityScrollHint">
2884+
A preferred position for the node scrolled into view. Top-left edge of the scroll container.
2885+
</constant>
2886+
<constant name="SCROLL_HINT_BOTTOM_RIGHT" value="1" enum="AccessibilityScrollHint">
2887+
A preferred position for the node scrolled into view. Bottom-right edge of the scroll container.
2888+
</constant>
2889+
<constant name="SCROLL_HINT_TOP_EDGE" value="2" enum="AccessibilityScrollHint">
2890+
A preferred position for the node scrolled into view. Top edge of the scroll container.
2891+
</constant>
2892+
<constant name="SCROLL_HINT_BOTTOM_EDGE" value="3" enum="AccessibilityScrollHint">
2893+
A preferred position for the node scrolled into view. Bottom edge of the scroll container.
2894+
</constant>
2895+
<constant name="SCROLL_HINT_LEFT_EDGE" value="4" enum="AccessibilityScrollHint">
2896+
A preferred position for the node scrolled into view. Left edge of the scroll container.
2897+
</constant>
2898+
<constant name="SCROLL_HINT_RIGHT_EDGE" value="5" enum="AccessibilityScrollHint">
2899+
A preferred position for the node scrolled into view. Right edge of the scroll container.
2900+
</constant>
28772901
<constant name="MOUSE_MODE_VISIBLE" value="0" enum="MouseMode">
28782902
Makes the mouse cursor visible if it is hidden.
28792903
</constant>

‎drivers/accesskit/accessibility_driver_accesskit.cpp‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,36 @@ void AccessibilityDriverAccessKit::_accessibility_action_callback(struct accessk
136136
case ACCESSKIT_ACTION_DATA_NUMERIC_VALUE: {
137137
rq_data = p_request->data.value.numeric_value;
138138
} break;
139-
case ACCESSKIT_ACTION_DATA_SCROLL_TARGET_RECT: {
140-
rq_data = Rect2(p_request->data.value.scroll_target_rect.x0, p_request->data.value.scroll_target_rect.y0, p_request->data.value.scroll_target_rect.x1 - p_request->data.value.scroll_target_rect.x0, p_request->data.value.scroll_target_rect.y1 - p_request->data.value.scroll_target_rect.y0);
139+
case ACCESSKIT_ACTION_DATA_SCROLL_HINT: {
140+
switch (p_request->data.value.scroll_hint) {
141+
case ACCESSKIT_SCROLL_HINT_TOP_LEFT: {
142+
rq_data = DisplayServer::SCROLL_HINT_TOP_LEFT;
143+
} break;
144+
case ACCESSKIT_SCROLL_HINT_BOTTOM_RIGHT: {
145+
rq_data = DisplayServer::SCROLL_HINT_BOTTOM_RIGHT;
146+
} break;
147+
case ACCESSKIT_SCROLL_HINT_TOP_EDGE: {
148+
rq_data = DisplayServer::SCROLL_HINT_TOP_EDGE;
149+
} break;
150+
case ACCESSKIT_SCROLL_HINT_BOTTOM_EDGE: {
151+
rq_data = DisplayServer::SCROLL_HINT_BOTTOM_EDGE;
152+
} break;
153+
case ACCESSKIT_SCROLL_HINT_LEFT_EDGE: {
154+
rq_data = DisplayServer::SCROLL_HINT_LEFT_EDGE;
155+
} break;
156+
case ACCESSKIT_SCROLL_HINT_RIGHT_EDGE: {
157+
rq_data = DisplayServer::SCROLL_HINT_RIGHT_EDGE;
158+
} break;
159+
default:
160+
break;
161+
}
162+
} break;
163+
case ACCESSKIT_ACTION_DATA_SCROLL_UNIT: {
164+
if (p_request->data.value.scroll_unit == ACCESSKIT_SCROLL_UNIT_ITEM) {
165+
rq_data = DisplayServer::SCROLL_UNIT_ITEM;
166+
} else if (p_request->data.value.scroll_unit == ACCESSKIT_SCROLL_UNIT_PAGE) {
167+
rq_data = DisplayServer::SCROLL_UNIT_PAGE;
168+
}
141169
} break;
142170
case ACCESSKIT_ACTION_DATA_SCROLL_TO_POINT: {
143171
rq_data = Point2(p_request->data.value.scroll_to_point.x, p_request->data.value.scroll_to_point.y);
@@ -1621,9 +1649,9 @@ AccessibilityDriverAccessKit::AccessibilityDriverAccessKit() {
16211649
//action_map[DisplayServer::AccessibilityAction::ACTION_LOAD_INLINE_TEXT_BOXES] = ACCESSKIT_ACTION_LOAD_INLINE_TEXT_BOXES;
16221650
action_map[DisplayServer::AccessibilityAction::ACTION_SET_TEXT_SELECTION] = ACCESSKIT_ACTION_SET_TEXT_SELECTION;
16231651
action_map[DisplayServer::AccessibilityAction::ACTION_REPLACE_SELECTED_TEXT] = ACCESSKIT_ACTION_REPLACE_SELECTED_TEXT;
1624-
action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_BACKWARD] = ACCESSKIT_ACTION_SCROLL_BACKWARD;
1652+
action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_BACKWARD] = ACCESSKIT_ACTION_SCROLL_UP;
16251653
action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN] = ACCESSKIT_ACTION_SCROLL_DOWN;
1626-
action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_FORWARD] = ACCESSKIT_ACTION_SCROLL_FORWARD;
1654+
action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_FORWARD] = ACCESSKIT_ACTION_SCROLL_DOWN;
16271655
action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT] = ACCESSKIT_ACTION_SCROLL_LEFT;
16281656
action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT] = ACCESSKIT_ACTION_SCROLL_RIGHT;
16291657
action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_UP] = ACCESSKIT_ACTION_SCROLL_UP;

‎scene/gui/item_list.cpp‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,19 +1204,35 @@ void ItemList::_accessibility_action_scroll_set(const Variant &p_data) {
12041204
}
12051205

12061206
void ItemList::_accessibility_action_scroll_up(const Variant &p_data) {
1207-
scroll_bar_v->set_value(scroll_bar_v->get_value() - scroll_bar_v->get_page() / 4);
1207+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
1208+
scroll_bar_v->set_value(scroll_bar_v->get_value() - scroll_bar_v->get_page() / 4);
1209+
} else {
1210+
scroll_bar_v->set_value(scroll_bar_v->get_value() - scroll_bar_v->get_page());
1211+
}
12081212
}
12091213

12101214
void ItemList::_accessibility_action_scroll_down(const Variant &p_data) {
1211-
scroll_bar_v->set_value(scroll_bar_v->get_value() + scroll_bar_v->get_page() / 4);
1215+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
1216+
scroll_bar_v->set_value(scroll_bar_v->get_value() + scroll_bar_v->get_page() / 4);
1217+
} else {
1218+
scroll_bar_v->set_value(scroll_bar_v->get_value() + scroll_bar_v->get_page());
1219+
}
12121220
}
12131221

12141222
void ItemList::_accessibility_action_scroll_left(const Variant &p_data) {
1215-
scroll_bar_h->set_value(scroll_bar_h->get_value() - scroll_bar_h->get_page() / 4);
1223+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
1224+
scroll_bar_h->set_value(scroll_bar_h->get_value() - scroll_bar_h->get_page() / 4);
1225+
} else {
1226+
scroll_bar_h->set_value(scroll_bar_h->get_value() - scroll_bar_h->get_page());
1227+
}
12161228
}
12171229

12181230
void ItemList::_accessibility_action_scroll_right(const Variant &p_data) {
1219-
scroll_bar_h->set_value(scroll_bar_h->get_value() + scroll_bar_h->get_page() / 4);
1231+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
1232+
scroll_bar_h->set_value(scroll_bar_h->get_value() + scroll_bar_h->get_page() / 4);
1233+
} else {
1234+
scroll_bar_h->set_value(scroll_bar_h->get_value() + scroll_bar_h->get_page());
1235+
}
12201236
}
12211237

12221238
void ItemList::_accessibility_action_scroll_into_view(const Variant &p_data, int p_index) {

‎scene/gui/rich_text_label.cpp‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,11 +2189,19 @@ void RichTextLabel::_accessibility_action_menu(const Variant &p_data) {
21892189
}
21902190

21912191
void RichTextLabel::_accessibility_scroll_down(const Variant &p_data) {
2192-
vscroll->set_value(vscroll->get_value() + vscroll->get_page() / 4);
2192+
if ((uint8_t)p_data == 0) {
2193+
vscroll->set_value(vscroll->get_value() + vscroll->get_page() / 4);
2194+
} else {
2195+
vscroll->set_value(vscroll->get_value() + vscroll->get_page());
2196+
}
21932197
}
21942198

21952199
void RichTextLabel::_accessibility_scroll_up(const Variant &p_data) {
2196-
vscroll->set_value(vscroll->get_value() - vscroll->get_page() / 4);
2200+
if ((uint8_t)p_data == 0) {
2201+
vscroll->set_value(vscroll->get_value() - vscroll->get_page() / 4);
2202+
} else {
2203+
vscroll->set_value(vscroll->get_value() - vscroll->get_page());
2204+
}
21972205
}
21982206

21992207
void RichTextLabel::_accessibility_scroll_set(const Variant &p_data) {

‎scene/gui/scroll_container.cpp‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -413,19 +413,35 @@ void ScrollContainer::_accessibility_action_scroll_set(const Variant &p_data) {
413413
}
414414

415415
void ScrollContainer::_accessibility_action_scroll_up(const Variant &p_data) {
416-
v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
416+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
417+
v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
418+
} else {
419+
v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page());
420+
}
417421
}
418422

419423
void ScrollContainer::_accessibility_action_scroll_down(const Variant &p_data) {
420-
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
424+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
425+
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
426+
} else {
427+
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page());
428+
}
421429
}
422430

423431
void ScrollContainer::_accessibility_action_scroll_left(const Variant &p_data) {
424-
h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
432+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
433+
h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
434+
} else {
435+
h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page());
436+
}
425437
}
426438

427439
void ScrollContainer::_accessibility_action_scroll_right(const Variant &p_data) {
428-
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
440+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
441+
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
442+
} else {
443+
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page());
444+
}
429445
}
430446

431447
void ScrollContainer::_notification(int p_what) {

‎scene/gui/text_edit.cpp‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -679,22 +679,38 @@ void TextEdit::_accessibility_action_menu(const Variant &p_data) {
679679
}
680680

681681
void TextEdit::_accessibility_scroll_down(const Variant &p_data) {
682-
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 4);
682+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
683+
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 4);
684+
} else {
685+
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page());
686+
}
683687
queue_accessibility_update();
684688
}
685689

686690
void TextEdit::_accessibility_scroll_left(const Variant &p_data) {
687-
h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 4);
691+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
692+
h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 4);
693+
} else {
694+
h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page());
695+
}
688696
queue_accessibility_update();
689697
}
690698

691699
void TextEdit::_accessibility_scroll_right(const Variant &p_data) {
692-
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 4);
700+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
701+
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 4);
702+
} else {
703+
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page());
704+
}
693705
queue_accessibility_update();
694706
}
695707

696708
void TextEdit::_accessibility_scroll_up(const Variant &p_data) {
697-
v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 4);
709+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
710+
v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 4);
711+
} else {
712+
v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page());
713+
}
698714
queue_accessibility_update();
699715
}
700716

‎scene/gui/tree.cpp‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4571,19 +4571,35 @@ PackedStringArray Tree::get_accessibility_configuration_warnings() const {
45714571
}
45724572

45734573
void Tree::_accessibility_action_scroll_down(const Variant &p_data) {
4574-
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 4);
4574+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
4575+
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 4);
4576+
} else {
4577+
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page());
4578+
}
45754579
}
45764580

45774581
void Tree::_accessibility_action_scroll_left(const Variant &p_data) {
4578-
h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 4);
4582+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
4583+
h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 4);
4584+
} else {
4585+
h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page());
4586+
}
45794587
}
45804588

45814589
void Tree::_accessibility_action_scroll_right(const Variant &p_data) {
4582-
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 4);
4590+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
4591+
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 4);
4592+
} else {
4593+
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page());
4594+
}
45834595
}
45844596

45854597
void Tree::_accessibility_action_scroll_up(const Variant &p_data) {
4586-
v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 4);
4598+
if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
4599+
v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 4);
4600+
} else {
4601+
v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page());
4602+
}
45874603
}
45884604

45894605
void Tree::_accessibility_action_scroll_set(const Variant &p_data) {

0 commit comments

Comments
 (0)