Skip to content

Commit 8fcf4f6

Browse files
committed
Remove DisplayServer includes from window.h
1 parent 820d320 commit 8fcf4f6

16 files changed

+24
-5
lines changed

editor/gui/editor_spin_slider.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030

3131
#include "editor_spin_slider.h"
3232

33+
#include "core/config/engine.h"
3334
#include "core/input/input.h"
3435
#include "core/math/expression.h"
3536
#include "core/object/class_db.h"
3637
#include "core/os/keyboard.h"
38+
#include "core/os/os.h"
3739
#include "core/string/translation_server.h"
3840
#include "editor/editor_string_names.h"
3941
#include "editor/settings/editor_settings.h"

editor/gui/editor_title_bar.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "editor_title_bar.h"
3232

3333
#include "core/object/callable_method_pointer.h"
34+
#include "servers/display/display_server.h"
3435

3536
void EditorTitleBar::gui_input(const Ref<InputEvent> &p_event) {
3637
if (!can_move) {

editor/project_manager/project_list.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "core/input/input.h"
3535
#include "core/io/dir_access.h"
3636
#include "core/object/class_db.h"
37+
#include "core/os/os.h"
3738
#include "core/os/time.h"
3839
#include "core/version.h"
3940
#include "editor/editor_string_names.h"
@@ -52,6 +53,7 @@
5253
#include "scene/gui/texture_rect.h"
5354
#include "scene/resources/image_texture.h"
5455
#include "servers/display/accessibility_server.h"
56+
#include "servers/display/display_server.h"
5557

5658
void ProjectListItemControl::_notification(int p_what) {
5759
switch (p_what) {

editor/project_manager/quick_settings_dialog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include "scene/gui/label.h"
4444
#include "scene/gui/option_button.h"
4545
#include "scene/gui/panel_container.h"
46+
#include "servers/display/display_server.h"
4647

4748
void QuickSettingsDialog::_fetch_setting_values() {
4849
#ifndef ANDROID_ENABLED

editor/run/embedded_process.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@
3333
#include "core/config/project_settings.h"
3434
#include "core/input/input.h"
3535
#include "core/object/class_db.h"
36+
#include "core/os/os.h"
3637
#include "editor/editor_string_names.h"
3738
#include "scene/main/timer.h"
3839
#include "scene/main/window.h"
3940
#include "scene/resources/style_box_flat.h"
4041
#include "scene/theme/theme_db.h"
42+
#include "servers/display/display_server.h"
4143

4244
void EmbeddedProcessBase::_notification(int p_what) {
4345
switch (p_what) {

editor/run/run_instances_dialog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "run_instances_dialog.h"
3232

3333
#include "core/config/project_settings.h"
34+
#include "core/os/os.h"
3435
#include "editor/settings/editor_settings.h"
3536
#include "editor/themes/editor_scale.h"
3637
#include "scene/gui/check_box.h"

editor/settings/event_listener_line_edit.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#include "core/input/input_map.h"
3434
#include "core/object/class_db.h"
35+
#include "core/os/os.h"
3536
#include "scene/gui/dialogs.h"
3637
#include "servers/display/accessibility_server.h"
3738

modules/webxr/webxr_interface_js.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include "scene/main/scene_tree.h"
4141
#include "scene/main/window.h"
4242
#include "scene/scene_string_names.h"
43+
#include "servers/display/display_server.h"
4344
#include "servers/xr/xr_hand_tracker.h"
4445

4546
#include <emscripten.h>

scene/gui/color_picker.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#include "scene/resources/style_box_texture.h"
5656
#include "scene/theme/theme_db.h"
5757
#include "servers/display/accessibility_server.h"
58+
#include "servers/display/display_server.h"
5859

5960
static inline bool is_color_overbright(const Color &color) {
6061
return (color.r > 1.0) || (color.g > 1.0) || (color.b > 1.0);

scene/gui/file_dialog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include "scene/gui/separator.h"
4949
#include "scene/gui/split_container.h"
5050
#include "scene/theme/theme_db.h"
51+
#include "servers/display/display_server.h"
5152

5253
void FileDialog::popup_file_dialog() {
5354
popup_centered_clamped(Vector2(1050, 700) * get_theme_default_base_scale(), 0.8f);

0 commit comments

Comments
 (0)