hertog/godot-module-template
Template
2
1
Fork 1
Code Issues 2 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Move DisplayServer enums and typedefs to DisplayServerEnums

Browse source 
This will allow decoupling `display_server.h` from a number of headers in the
codebase which only require those enums and not all the DisplayServer API.
This commit is contained in:
Rémi Verschelde 2026-02-26 12:36:47 +01:00
parent 778cf54dab
commit a447ac95ec
No known key found for this signature in database
GPG key ID: C3336907360768E1
160 changed files with 4584 additions and 4520 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scene/main/scene_tree.cpp
View file

@ -209,7 +209,7 @@ void SceneTree::flush_transform_notifications() {
}
bool SceneTree::is_accessibility_enabled() const {
if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ACCESSIBILITY_SCREEN_READER)) {
if (!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_ACCESSIBILITY_SCREEN_READER)) {
return false;
}
@ -222,7 +222,7 @@ bool SceneTree::is_accessibility_enabled() const {
}
bool SceneTree::is_accessibility_supported() const {
if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ACCESSIBILITY_SCREEN_READER)) {
if (!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_ACCESSIBILITY_SCREEN_READER)) {
return false;
}
@ -247,7 +247,7 @@ void SceneTree::_accessibility_notify_change(const Node *p_node, bool p_remove)
}
}
void SceneTree::_process_accessibility_changes(DisplayServer::WindowID p_window_id) {
void SceneTree::_process_accessibility_changes(DisplayServerEnums::WindowID p_window_id) {
// Process NOTIFICATION_ACCESSIBILITY_UPDATE.
Vector<ObjectID> processed;
for (const ObjectID &id : accessibility_change_queue) {
@ -274,8 +274,8 @@ void SceneTree::_process_accessibility_changes(DisplayServer::WindowID p_window_
}
// Popups have no native window focus, but have focused element.
DisplayServer::WindowID popup_id = DisplayServer::get_singleton()->window_get_active_popup();
if (popup_id != DisplayServer::INVALID_WINDOW_ID) {
DisplayServerEnums::WindowID popup_id = DisplayServer::get_singleton()->window_get_active_popup();
if (popup_id != DisplayServerEnums::INVALID_WINDOW_ID) {
Window *popup_w = Window::get_from_id(popup_id);
if (popup_w && w_this->is_ancestor_of(popup_w)) {
w_this = popup_w;