seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[TextServer, GDExtension] Fix building text servers as GDExtension, expose new/changed low-level methods to GDExtension API.

Browse Source
This commit is contained in:
bruvzg
2024-06-02 21:21:18 +03:00
parent 475248d99d
commit e651421905
18 changed files with 170 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
servers/text/text_server_extension.cpp
View File

@ -659,12 +659,12 @@ int64_t TextServerExtension::font_get_spacing(const RID &p_font_rid, SpacingType
return ret;
}
void TextServerExtension::font_set_baseline_offset(const RID &p_font_rid, float p_baseline_offset) {
void TextServerExtension::font_set_baseline_offset(const RID &p_font_rid, double p_baseline_offset) {
GDVIRTUAL_CALL(_font_set_baseline_offset, p_font_rid, p_baseline_offset);
}
float TextServerExtension::font_get_baseline_offset(const RID &p_font_rid) const {
float ret = 0.0;
double TextServerExtension::font_get_baseline_offset(const RID &p_font_rid) const {
double ret = 0.0;
GDVIRTUAL_CALL(_font_get_baseline_offset, p_font_rid, ret);
return ret;
}
@ -1493,7 +1493,7 @@ bool TextServerExtension::is_valid_identifier(const String &p_string) const {
return TextServer::is_valid_identifier(p_string);
}
bool TextServerExtension::is_valid_letter(char32_t p_unicode) const {
bool TextServerExtension::is_valid_letter(uint64_t p_unicode) const {
bool ret;
if (GDVIRTUAL_CALL(_is_valid_letter, p_unicode, ret)) {
return ret;

12
servers/text/text_server_extension.h
View File

@ -178,10 +178,10 @@ public:
GDVIRTUAL3(_font_set_spacing, const RID &, SpacingType, int64_t);
GDVIRTUAL2RC(int64_t, _font_get_spacing, const RID &, SpacingType);
virtual void font_set_baseline_offset(const RID &p_font_rid, float p_baseline_offset) override;
virtual float font_get_baseline_offset(const RID &p_font_rid) const override;
GDVIRTUAL2(_font_set_baseline_offset, const RID &, float);
GDVIRTUAL1RC(float, _font_get_baseline_offset, const RID &);
virtual void font_set_baseline_offset(const RID &p_font_rid, double p_baseline_offset) override;
virtual double font_get_baseline_offset(const RID &p_font_rid) const override;
GDVIRTUAL2(_font_set_baseline_offset, const RID &, double);
GDVIRTUAL1RC(double, _font_get_baseline_offset, const RID &);
virtual void font_set_transform(const RID &p_font_rid, const Transform2D &p_transform) override;
virtual Transform2D font_get_transform(const RID &p_font_rid) const override;
@ -563,8 +563,8 @@ public:
virtual bool is_valid_identifier(const String &p_string) const override;
GDVIRTUAL1RC(bool, _is_valid_identifier, const String &);
virtual bool is_valid_letter(char32_t p_unicode) const override;
GDVIRTUAL1RC(bool, _is_valid_letter, char32_t);
virtual bool is_valid_letter(uint64_t p_unicode) const override;
GDVIRTUAL1RC(bool, _is_valid_letter, uint64_t);
virtual String string_to_upper(const String &p_string, const String &p_language = "") const override;
virtual String string_to_lower(const String &p_string, const String &p_language = "") const override;