Merge pull request #119328 from bruvzg/ac_nested_popup_rects

[Accessibility] Fix positions of nested popups sent to the screen reader.

scene/gui/control.h

@@ -763,6 +763,8 @@ public:
 	void set_accessibility_flow_to_nodes(const TypedArray<NodePath> &p_node_path);
 	TypedArray<NodePath> get_accessibility_flow_to_nodes() const;
 
+	virtual Transform2D get_accessibility_transform() const override { return get_transform(); }
+
 	// Rendering.
 
 	void set_default_cursor_shape(CursorShape p_shape);

scene/main/node.cpp

@@ -3725,6 +3725,14 @@ RID Node::get_focused_accessibility_element() const {
 	}
 }
 
+Transform2D Node::get_accessibility_transform() const {
+	if (is_inside_tree() && data.parent) {
+		return data.parent->get_accessibility_transform();
+	} else {
+		return Transform2D();
+	}
+}
+
 void Node::queue_accessibility_update() {
 	if (is_inside_tree() && !is_part_of_edited_scene()) {
 		data.tree->_accessibility_notify_change(this);

scene/main/node.h

@@ -725,6 +725,7 @@ public:
 	virtual RID get_accessibility_element() const;
 	virtual RID get_focused_accessibility_element() const;
 	virtual bool accessibility_override_tree_hierarchy() const { return false; }
+	virtual Transform2D get_accessibility_transform() const;
 
 	virtual PackedStringArray get_accessibility_configuration_warnings() const;
 

scene/main/window.cpp

@@ -1547,6 +1547,25 @@ PackedStringArray Window::get_accessibility_configuration_warnings() const {
 	return warnings;
 }
 
+Transform2D Window::get_accessibility_transform() const {
+	if (is_inside_tree() && get_parent()) {
+		Transform2D parent_tr = get_parent()->get_accessibility_transform();
+		Transform2D window_tr;
+		if (window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+			window_tr.set_origin(position);
+		} else {
+			Window *np = get_non_popup_window();
+			if (np) {
+				window_tr.set_origin(get_position() - np->get_position());
+			}
+		}
+		window_tr.set_scale(Vector2(1.f, 1.f) * get_content_scale_factor());
+		return parent_tr.affine_inverse() * window_tr;
+	} else {
+		return Transform2D();
+	}
+}
+
 void Window::_notification(int p_what) {
 	ERR_MAIN_THREAD_GUARD;
 	switch (p_what) {
@@ -1573,19 +1592,8 @@ void Window::_notification(int p_what) {
 			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, !visible);
 
 			if (get_embedder() || is_popup()) {
-				Control *parent_ctrl = Object::cast_to<Control>(get_parent());
-				Transform2D parent_tr = parent_ctrl ? parent_ctrl->get_global_transform() : Transform2D();
-				Transform2D tr;
-				if (window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
-					tr.set_origin(position);
-				} else {
-					Window *np = get_non_popup_window();
-					if (np) {
-						tr.set_origin(get_position() - np->get_position());
-					}
-				}
-				AccessibilityServer::get_singleton()->update_set_transform(ae, parent_tr.affine_inverse() * tr);
-				AccessibilityServer::get_singleton()->update_set_bounds(ae, Rect2(Point2(), size));
+				AccessibilityServer::get_singleton()->update_set_transform(ae, get_accessibility_transform());
+				AccessibilityServer::get_singleton()->update_set_bounds(ae, Rect2(Point2(), Vector2(size) / get_content_scale_factor()));
 
 				if (accessibility_title_element.is_null()) {
 					accessibility_title_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_TITLE_BAR);

scene/main/window.h

@@ -457,6 +457,8 @@ public:
 
 	void accessibility_announcement(const String &p_announcement);
 
+	virtual Transform2D get_accessibility_transform() const override;
+
 	// Internationalization.
 
 	void set_layout_direction(LayoutDirection p_direction);