diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-24 16:05:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 16:05:59 +0200 |
| commit | 4698dc67b575a93d83933147207b0e57e7a58672 (patch) | |
| tree | e182c2313f758d5babf2ab9b8c159a93ac2e9b54 /servers/text_server.h | |
| parent | 5d14d0870269eb6c4eeb7bff6e8e66dfd0f4773e (diff) | |
| parent | f7f4873ed08d6b465c8108f7ce0c1cb76f9caf2f (diff) | |
Merge pull request #64082 from KoBeWi/array3k
Diffstat (limited to 'servers/text_server.h')
| -rw-r--r-- | servers/text_server.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/text_server.h b/servers/text_server.h index 6360cc1726..9ffc2984d1 100644 --- a/servers/text_server.h +++ b/servers/text_server.h @@ -414,9 +414,9 @@ public: virtual bool shaped_text_is_ready(const RID &p_shaped) const = 0; virtual const Glyph *shaped_text_get_glyphs(const RID &p_shaped) const = 0; - Array _shaped_text_get_glyphs_wrapper(const RID &p_shaped) const; + TypedArray<Dictionary> _shaped_text_get_glyphs_wrapper(const RID &p_shaped) const; virtual const Glyph *shaped_text_sort_logical(const RID &p_shaped) = 0; - Array _shaped_text_sort_logical_wrapper(const RID &p_shaped); + TypedArray<Dictionary> _shaped_text_sort_logical_wrapper(const RID &p_shaped); virtual int64_t shaped_text_get_glyph_count(const RID &p_shaped) const = 0; virtual Vector2i shaped_text_get_range(const RID &p_shaped) const = 0; @@ -428,7 +428,7 @@ public: virtual int64_t shaped_text_get_trim_pos(const RID &p_shaped) const = 0; virtual int64_t shaped_text_get_ellipsis_pos(const RID &p_shaped) const = 0; virtual const Glyph *shaped_text_get_ellipsis_glyphs(const RID &p_shaped) const = 0; - Array _shaped_text_get_ellipsis_glyphs_wrapper(const RID &p_shaped) const; + TypedArray<Dictionary> _shaped_text_get_ellipsis_glyphs_wrapper(const RID &p_shaped) const; virtual int64_t shaped_text_get_ellipsis_glyph_count(const RID &p_shaped) const = 0; virtual void shaped_text_overrun_trim_to_width(const RID &p_shaped, double p_width, BitField<TextServer::TextOverrunFlag> p_trim_flags) = 0; @@ -541,7 +541,7 @@ public: int get_interface_count() const; Ref<TextServer> get_interface(int p_index) const; Ref<TextServer> find_interface(const String &p_name) const; - Array get_interfaces() const; + TypedArray<Dictionary> get_interfaces() const; _FORCE_INLINE_ Ref<TextServer> get_primary_interface() const { return primary_interface; |