Skip to content

Commit 84d14de

Browse files
akien-mgaakien-mga
committed
Move all remaining enums from DisplayServer to DisplayServerEnums
1 parent 7556774 commit 84d14de

File tree

90 files changed

+1735
-1724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1735
-1724
lines changed

‎core/config/project_settings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1756,7 +1756,7 @@ ProjectSettings::ProjectSettings() {
17561756

17571757
_add_builtin_input_map();
17581758

1759-
// Keep the enum values in sync with the `DisplayServer::ScreenOrientation` enum.
1759+
// Keep the enum values in sync with the `DisplayServerEnums::ScreenOrientation` enum.
17601760
custom_prop_info["display/window/handheld/orientation"] = PropertyInfo(Variant::INT, "display/window/handheld/orientation", PROPERTY_HINT_ENUM, "Landscape,Portrait,Reverse Landscape,Reverse Portrait,Sensor Landscape,Sensor Portrait,Sensor");
17611761
GLOBAL_DEF("display/window/subwindows/embed_subwindows", true);
17621762
// Keep the enum values in sync with the `DisplayServerEnums::VSyncMode` enum.

‎core/input/input.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
class GamepadMotion;
4242

4343
namespace InputClassEnums {
44-
// Keep synced with "DisplayServer::MouseMode" enum.
44+
// Keep synced with DisplayServerEnums::MouseMode enum.
4545
enum MouseMode : int {
4646
MOUSE_MODE_VISIBLE,
4747
MOUSE_MODE_HIDDEN,
@@ -51,6 +51,7 @@ enum MouseMode : int {
5151
MOUSE_MODE_MAX,
5252
};
5353

54+
// Keep synced with DisplayServerEnums and Control enums.
5455
#undef CursorShape
5556
enum CursorShape : int {
5657
CURSOR_ARROW,

‎drivers/apple_embedded/display_server_apple_embedded.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class DisplayServerAppleEmbedded : public DisplayServer {
7171

7272
id tts = nullptr;
7373

74-
DisplayServer::ScreenOrientation screen_orientation;
74+
DisplayServerEnums::ScreenOrientation screen_orientation;
7575

7676
ObjectID window_attached_instance_id;
7777

@@ -98,7 +98,7 @@ class DisplayServerAppleEmbedded : public DisplayServer {
9898
virtual float _screen_current_edr_headroom() const { return 1.0f; }
9999
float hardware_reference_luminance_nits = 100.0f;
100100

101-
DisplayServerAppleEmbedded(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
101+
DisplayServerAppleEmbedded(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
102102
~DisplayServerAppleEmbedded();
103103

104104
public:
@@ -148,7 +148,7 @@ class DisplayServerAppleEmbedded : public DisplayServer {
148148

149149
// MARK: -
150150

151-
virtual bool has_feature(Feature p_feature) const override;
151+
virtual bool has_feature(DisplayServerEnums::Feature p_feature) const override;
152152

153153
virtual bool tts_is_speaking() const override;
154154
virtual bool tts_is_paused() const override;
@@ -167,15 +167,15 @@ class DisplayServerAppleEmbedded : public DisplayServer {
167167

168168
virtual int get_screen_count() const override;
169169
virtual int get_primary_screen() const override;
170-
virtual Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
171-
virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
172-
virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
170+
virtual Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
171+
virtual Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
172+
virtual Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
173173

174174
virtual Vector<DisplayServerEnums::WindowID> get_window_list() const override;
175175

176176
virtual DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const override;
177177

178-
virtual int64_t window_get_native_handle(HandleType p_handle_type, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
178+
virtual int64_t window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
179179

180180
virtual void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
181181
virtual ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
@@ -215,8 +215,8 @@ class DisplayServerAppleEmbedded : public DisplayServer {
215215

216216
virtual float screen_get_max_scale() const override;
217217

218-
virtual void screen_set_orientation(DisplayServer::ScreenOrientation p_orientation, int p_screen) override;
219-
virtual DisplayServer::ScreenOrientation screen_get_orientation(int p_screen) const override;
218+
virtual void screen_set_orientation(DisplayServerEnums::ScreenOrientation p_orientation, int p_screen) override;
219+
virtual DisplayServerEnums::ScreenOrientation screen_get_orientation(int p_screen) const override;
220220

221221
virtual bool window_can_draw(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
222222

@@ -227,7 +227,7 @@ class DisplayServerAppleEmbedded : public DisplayServer {
227227

228228
virtual bool is_touchscreen_available() const override;
229229

230-
virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) override;
230+
virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, DisplayServerEnums::VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) override;
231231
virtual void virtual_keyboard_hide() override;
232232

233233
void virtual_keyboard_set_height(int height);

‎drivers/apple_embedded/display_server_apple_embedded.mm‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
return (DisplayServerAppleEmbedded *)DisplayServer::get_singleton();
5353
}
5454

55-
DisplayServerAppleEmbedded::DisplayServerAppleEmbedded(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
55+
DisplayServerAppleEmbedded::DisplayServerAppleEmbedded(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
5656
KeyMappingAppleEmbedded::initialize();
5757

5858
rendering_driver = p_rendering_driver;
@@ -354,34 +354,34 @@
354354

355355
// MARK: -
356356

357-
bool DisplayServerAppleEmbedded::has_feature(Feature p_feature) const {
357+
bool DisplayServerAppleEmbedded::has_feature(DisplayServerEnums::Feature p_feature) const {
358358
switch (p_feature) {
359359
#ifndef DISABLE_DEPRECATED
360-
case FEATURE_GLOBAL_MENU: {
360+
case DisplayServerEnums::FEATURE_GLOBAL_MENU: {
361361
return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU));
362362
} break;
363363
#endif
364-
// case FEATURE_CURSOR_SHAPE:
365-
// case FEATURE_CUSTOM_CURSOR_SHAPE:
366-
// case FEATURE_HIDPI:
367-
// case FEATURE_ICON:
368-
// case FEATURE_IME:
369-
// case FEATURE_MOUSE:
370-
// case FEATURE_MOUSE_WARP:
371-
// case FEATURE_NATIVE_DIALOG:
372-
// case FEATURE_NATIVE_DIALOG_INPUT:
373-
// case FEATURE_NATIVE_DIALOG_FILE:
374-
// case FEATURE_NATIVE_DIALOG_FILE_EXTRA:
375-
// case FEATURE_NATIVE_DIALOG_FILE_MIME:
376-
// case FEATURE_NATIVE_ICON:
377-
// case FEATURE_WINDOW_TRANSPARENCY:
378-
case FEATURE_CLIPBOARD:
379-
case FEATURE_HDR_OUTPUT:
380-
case FEATURE_KEEP_SCREEN_ON:
381-
case FEATURE_ORIENTATION:
382-
case FEATURE_TOUCHSCREEN:
383-
case FEATURE_VIRTUAL_KEYBOARD:
384-
case FEATURE_TEXT_TO_SPEECH:
364+
// case DisplayServerEnums::FEATURE_CURSOR_SHAPE:
365+
// case DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE:
366+
// case DisplayServerEnums::FEATURE_HIDPI:
367+
// case DisplayServerEnums::FEATURE_ICON:
368+
// case DisplayServerEnums::FEATURE_IME:
369+
// case DisplayServerEnums::FEATURE_MOUSE:
370+
// case DisplayServerEnums::FEATURE_MOUSE_WARP:
371+
// case DisplayServerEnums::FEATURE_NATIVE_DIALOG:
372+
// case DisplayServerEnums::FEATURE_NATIVE_DIALOG_INPUT:
373+
// case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE:
374+
// case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA:
375+
// case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME:
376+
// case DisplayServerEnums::FEATURE_NATIVE_ICON:
377+
// case DisplayServerEnums::FEATURE_WINDOW_TRANSPARENCY:
378+
case DisplayServerEnums::FEATURE_CLIPBOARD:
379+
case DisplayServerEnums::FEATURE_HDR_OUTPUT:
380+
case DisplayServerEnums::FEATURE_KEEP_SCREEN_ON:
381+
case DisplayServerEnums::FEATURE_ORIENTATION:
382+
case DisplayServerEnums::FEATURE_TOUCHSCREEN:
383+
case DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD:
384+
case DisplayServerEnums::FEATURE_TEXT_TO_SPEECH:
385385
return true;
386386
default:
387387
return false;
@@ -539,16 +539,16 @@
539539
return DisplayServerEnums::MAIN_WINDOW_ID;
540540
}
541541

542-
int64_t DisplayServerAppleEmbedded::window_get_native_handle(HandleType p_handle_type, DisplayServerEnums::WindowID p_window) const {
542+
int64_t DisplayServerAppleEmbedded::window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window) const {
543543
ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, 0);
544544
switch (p_handle_type) {
545-
case DISPLAY_HANDLE: {
545+
case DisplayServerEnums::DISPLAY_HANDLE: {
546546
return 0; // Not supported.
547547
}
548-
case WINDOW_HANDLE: {
548+
case DisplayServerEnums::WINDOW_HANDLE: {
549549
return (int64_t)GDTAppDelegateService.viewController;
550550
}
551-
case WINDOW_VIEW: {
551+
case DisplayServerEnums::WINDOW_VIEW: {
552552
return (int64_t)GDTAppDelegateService.viewController.godotView;
553553
}
554554
default: {
@@ -570,7 +570,7 @@
570570
}
571571

572572
int DisplayServerAppleEmbedded::window_get_current_screen(DisplayServerEnums::WindowID p_window) const {
573-
ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, INVALID_SCREEN);
573+
ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, DisplayServerEnums::INVALID_SCREEN);
574574
return 0;
575575
}
576576

@@ -656,10 +656,10 @@
656656
}
657657

658658
float DisplayServerAppleEmbedded::screen_get_max_scale() const {
659-
return screen_get_scale(SCREEN_OF_MAIN_WINDOW);
659+
return screen_get_scale(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW);
660660
}
661661

662-
void DisplayServerAppleEmbedded::screen_set_orientation(DisplayServer::ScreenOrientation p_orientation, int p_screen) {
662+
void DisplayServerAppleEmbedded::screen_set_orientation(DisplayServerEnums::ScreenOrientation p_orientation, int p_screen) {
663663
p_screen = _get_screen_index(p_screen);
664664
int screen_count = get_screen_count();
665665
ERR_FAIL_INDEX(p_screen, screen_count);
@@ -675,10 +675,10 @@
675675
#endif
676676
}
677677

678-
DisplayServer::ScreenOrientation DisplayServerAppleEmbedded::screen_get_orientation(int p_screen) const {
678+
DisplayServerEnums::ScreenOrientation DisplayServerAppleEmbedded::screen_get_orientation(int p_screen) const {
679679
p_screen = _get_screen_index(p_screen);
680680
int screen_count = get_screen_count();
681-
ERR_FAIL_INDEX_V(p_screen, screen_count, SCREEN_LANDSCAPE);
681+
ERR_FAIL_INDEX_V(p_screen, screen_count, DisplayServerEnums::SCREEN_LANDSCAPE);
682682

683683
return screen_orientation;
684684
}
@@ -705,37 +705,37 @@ _FORCE_INLINE_ int _convert_utf32_offset_to_utf16(const String &p_existing_text,
705705
return limit;
706706
}
707707

708-
void DisplayServerAppleEmbedded::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
708+
void DisplayServerAppleEmbedded::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, DisplayServerEnums::VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
709709
NSString *existingString = [[NSString alloc] initWithUTF8String:p_existing_text.utf8().get_data()];
710710

711711
GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
712712
GDTAppDelegateService.viewController.keyboardView.textContentType = nil;
713713
switch (p_type) {
714-
case KEYBOARD_TYPE_DEFAULT: {
714+
case DisplayServerEnums::KEYBOARD_TYPE_DEFAULT: {
715715
GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
716716
} break;
717-
case KEYBOARD_TYPE_MULTILINE: {
717+
case DisplayServerEnums::KEYBOARD_TYPE_MULTILINE: {
718718
GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
719719
} break;
720-
case KEYBOARD_TYPE_NUMBER: {
720+
case DisplayServerEnums::KEYBOARD_TYPE_NUMBER: {
721721
GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeNumberPad;
722722
} break;
723-
case KEYBOARD_TYPE_NUMBER_DECIMAL: {
723+
case DisplayServerEnums::KEYBOARD_TYPE_NUMBER_DECIMAL: {
724724
GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeDecimalPad;
725725
} break;
726-
case KEYBOARD_TYPE_PHONE: {
726+
case DisplayServerEnums::KEYBOARD_TYPE_PHONE: {
727727
GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypePhonePad;
728728
GDTAppDelegateService.viewController.keyboardView.textContentType = UITextContentTypeTelephoneNumber;
729729
} break;
730-
case KEYBOARD_TYPE_EMAIL_ADDRESS: {
730+
case DisplayServerEnums::KEYBOARD_TYPE_EMAIL_ADDRESS: {
731731
GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeEmailAddress;
732732
GDTAppDelegateService.viewController.keyboardView.textContentType = UITextContentTypeEmailAddress;
733733
} break;
734-
case KEYBOARD_TYPE_PASSWORD: {
734+
case DisplayServerEnums::KEYBOARD_TYPE_PASSWORD: {
735735
GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
736736
GDTAppDelegateService.viewController.keyboardView.textContentType = UITextContentTypePassword;
737737
} break;
738-
case KEYBOARD_TYPE_URL: {
738+
case DisplayServerEnums::KEYBOARD_TYPE_URL: {
739739
GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeWebSearch;
740740
GDTAppDelegateService.viewController.keyboardView.textContentType = UITextContentTypeURL;
741741
} break;

‎drivers/apple_embedded/godot_view_controller.mm‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@ - (BOOL)shouldAutorotate {
281281
return NO;
282282
}
283283

284-
switch (DisplayServerAppleEmbedded::get_singleton()->screen_get_orientation(DisplayServer::SCREEN_OF_MAIN_WINDOW)) {
285-
case DisplayServer::SCREEN_SENSOR:
286-
case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
287-
case DisplayServer::SCREEN_SENSOR_PORTRAIT:
284+
switch (DisplayServerAppleEmbedded::get_singleton()->screen_get_orientation(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW)) {
285+
case DisplayServerEnums::SCREEN_SENSOR:
286+
case DisplayServerEnums::SCREEN_SENSOR_LANDSCAPE:
287+
case DisplayServerEnums::SCREEN_SENSOR_PORTRAIT:
288288
return YES;
289289
default:
290290
return NO;
@@ -296,24 +296,24 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
296296
return UIInterfaceOrientationMaskAll;
297297
}
298298

299-
switch (DisplayServerAppleEmbedded::get_singleton()->screen_get_orientation(DisplayServer::SCREEN_OF_MAIN_WINDOW)) {
300-
case DisplayServer::SCREEN_PORTRAIT:
299+
switch (DisplayServerAppleEmbedded::get_singleton()->screen_get_orientation(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW)) {
300+
case DisplayServerEnums::SCREEN_PORTRAIT:
301301
return UIInterfaceOrientationMaskPortrait;
302-
case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
302+
case DisplayServerEnums::SCREEN_REVERSE_LANDSCAPE:
303303
if (UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad) {
304304
return UIInterfaceOrientationMaskLandscapeLeft;
305305
} else {
306306
return UIInterfaceOrientationMaskLandscapeRight;
307307
}
308-
case DisplayServer::SCREEN_REVERSE_PORTRAIT:
308+
case DisplayServerEnums::SCREEN_REVERSE_PORTRAIT:
309309
return UIInterfaceOrientationMaskPortraitUpsideDown;
310-
case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
310+
case DisplayServerEnums::SCREEN_SENSOR_LANDSCAPE:
311311
return UIInterfaceOrientationMaskLandscape;
312-
case DisplayServer::SCREEN_SENSOR_PORTRAIT:
312+
case DisplayServerEnums::SCREEN_SENSOR_PORTRAIT:
313313
return UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown;
314-
case DisplayServer::SCREEN_SENSOR:
314+
case DisplayServerEnums::SCREEN_SENSOR:
315315
return UIInterfaceOrientationMaskAll;
316-
case DisplayServer::SCREEN_LANDSCAPE:
316+
case DisplayServerEnums::SCREEN_LANDSCAPE:
317317
if (UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad) {
318318
return UIInterfaceOrientationMaskLandscapeRight;
319319
} else {

‎drivers/apple_embedded/tts_apple_embedded.mm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ - (void)speechSynthesizer:(AVSpeechSynthesizer *)av_synth willSpeakRangeOfSpeech
5454
pos++;
5555
}
5656

57-
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_BOUNDARY, ids[utterance], pos);
57+
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_BOUNDARY, ids[utterance], pos);
5858
}
5959

6060
- (void)speechSynthesizer:(AVSpeechSynthesizer *)av_synth didCancelSpeechUtterance:(AVSpeechUtterance *)utterance {
61-
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, ids[utterance]);
61+
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, ids[utterance]);
6262
ids.erase(utterance);
6363
speaking = false;
6464
[self update];
6565
}
6666

6767
- (void)speechSynthesizer:(AVSpeechSynthesizer *)av_synth didFinishSpeechUtterance:(AVSpeechUtterance *)utterance {
68-
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_ENDED, ids[utterance]);
68+
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_ENDED, ids[utterance]);
6969
ids.erase(utterance);
7070
speaking = false;
7171
[self update];
@@ -87,7 +87,7 @@ - (void)update {
8787

8888
ids[new_utterance] = message.id;
8989
[av_synth speakUtterance:new_utterance];
90-
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_STARTED, message.id);
90+
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_STARTED, message.id);
9191

9292
queue.pop_front();
9393
speaking = true;
@@ -104,7 +104,7 @@ - (void)resumeSpeaking {
104104

105105
- (void)stopSpeaking {
106106
for (DisplayServer::TTSUtterance &message : queue) {
107-
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, message.id);
107+
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, message.id);
108108
}
109109
queue.clear();
110110
[av_synth stopSpeakingAtBoundary:AVSpeechBoundaryImmediate];
@@ -125,7 +125,7 @@ - (void)speak:(const String &)text voice:(const String &)voice volume:(int)volum
125125
}
126126

127127
if (text.is_empty()) {
128-
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, utterance_id);
128+
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, utterance_id);
129129
return;
130130
}
131131

‎editor/doc/editor_help.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4742,7 +4742,7 @@ void EditorHelpBitTooltip::popup_under_position(const Point2 &p_point) {
47424742
vr = window->get_usable_parent_rect();
47434743
}
47444744

4745-
if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS) || is_embedded()) {
4745+
if (!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS) || is_embedded()) {
47464746
if (r.size.x + r.position.x > vr.size.x + vr.position.x) {
47474747
// Place it in the opposite direction. If it fails, just hug the border.
47484748
r.position.x = p_point.x - r.size.x - tooltip_offset.x;

‎editor/doc/editor_help_search.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,13 @@ void EditorHelpSearch::_confirmed() {
198198
void EditorHelpSearch::_notification(int p_what) {
199199
switch (p_what) {
200200
case NOTIFICATION_ENTER_TREE: {
201-
if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_HELP)) {
201+
if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_HELP)) {
202202
DisplayServer::get_singleton()->help_set_search_callbacks(callable_mp(this, &EditorHelpSearch::_native_search_cb), callable_mp(this, &EditorHelpSearch::_native_action_cb));
203203
}
204204
} break;
205205

206206
case NOTIFICATION_EXIT_TREE: {
207-
if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_HELP)) {
207+
if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_HELP)) {
208208
DisplayServer::get_singleton()->help_set_search_callbacks();
209209
}
210210
} break;

0 commit comments

Comments
 (0)