Merge pull request #112031 from bruvzg/vm_os_f

Fix embedded window frame oversampling, fix DPITexture using uninitialized size in some conditions.
This commit is contained in:
Thaddeus Crews 2025-11-25 09:52:24 -06:00
commit 5ff7a9e793
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
6 changed files with 26 additions and 30 deletions

View file

@ -193,6 +193,8 @@ bool Glyph::operator>(const Glyph &p_a) const {
return p_a.start > start;
}
double TextServer::vp_oversampling = 0.0;
void TextServer::_bind_methods() {
ClassDB::bind_method(D_METHOD("has_feature", "feature"), &TextServer::has_feature);
ClassDB::bind_method(D_METHOD("get_name"), &TextServer::get_name);

View file

@ -230,7 +230,7 @@ public:
void _draw_hex_code_box_number(const RID &p_canvas, int64_t p_size, const Vector2 &p_pos, uint8_t p_index, const Color &p_color) const;
protected:
double vp_oversampling = 0.0;
static double vp_oversampling;
HashMap<char32_t, char32_t> diacritics_map;
void _diacritics_map_add(const String &p_from, char32_t p_to);
void _init_diacritics_map();
@ -610,7 +610,8 @@ public:
TypedArray<Vector3i> parse_structured_text(StructuredTextParser p_parser_type, const Array &p_args, const String &p_text) const;
virtual void set_current_drawn_item_oversampling(double p_vp_oversampling) { vp_oversampling = p_vp_oversampling; }
static void set_current_drawn_item_oversampling(double p_vp_oversampling) { vp_oversampling = p_vp_oversampling; }
static double get_current_drawn_item_oversampling() { return vp_oversampling; }
virtual void cleanup() {}