Skip to content

Commit e356499

Browse files
committed
Merge pull request #118888 from KoBeWi/access_denied
Fix EditorDock accessibility properties
2 parents 38fc4ff + b246d43 commit e356499

3 files changed

Lines changed: 15 additions & 1 deletion

File tree

doc/classes/EditorDock.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
</method>
8383
</methods>
8484
<members>
85+
<member name="accessibility_region" type="bool" setter="set_accessibility_region" getter="is_accessibility_region" overrides="Container" default="true" />
8586
<member name="available_layouts" type="int" setter="set_available_layouts" getter="get_available_layouts" enum="EditorDock.DockLayout" is_bitfield="true" default="5">
8687
The available layouts for this dock, as a bitmask. By default, the dock allows vertical and floating layouts.
8788
</member>

editor/docks/editor_dock.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,15 @@ void EditorDock::_emit_changed() {
4545
emit_signal(SNAME("_tab_style_changed"));
4646
}
4747

48+
void EditorDock::_validate_property(PropertyInfo &p_property) const {
49+
if (p_property.name == "accessibility_name") {
50+
p_property.usage = PROPERTY_USAGE_NONE;
51+
}
52+
}
53+
4854
void EditorDock::_notification(int p_what) {
4955
switch (p_what) {
5056
case NOTIFICATION_READY: {
51-
set_accessibility_region(true);
5257
set_accessibility_name(get_display_title());
5358
} break;
5459

@@ -322,3 +327,7 @@ Ref<Texture2D> EditorDock::get_effective_icon(const Callable &p_icon_fetch) {
322327
}
323328
return icon;
324329
}
330+
331+
EditorDock::EditorDock() {
332+
set_accessibility_region(true);
333+
}

editor/docks/editor_dock.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ class EditorDock : public MarginContainer {
9898
void _emit_changed();
9999

100100
protected:
101+
void _validate_property(PropertyInfo &p_property) const;
102+
101103
void _notification(int p_what);
102104
static void _bind_methods();
103105

@@ -160,6 +162,8 @@ class EditorDock : public MarginContainer {
160162

161163
virtual void save_layout_to_config(Ref<ConfigFile> &p_layout, const String &p_section) const { GDVIRTUAL_CALL(_save_layout_to_config, p_layout, p_section); }
162164
virtual void load_layout_from_config(const Ref<ConfigFile> &p_layout, const String &p_section) { GDVIRTUAL_CALL(_load_layout_from_config, p_layout, p_section); }
165+
166+
EditorDock();
163167
};
164168

165169
VARIANT_BITFIELD_CAST(EditorDock::DockLayout);

0 commit comments

Comments
 (0)