godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-31 18:41:20 +00:00
Code Releases Wiki Activity

Merge pull request #112031 from bruvzg/vm_os_f

Browse Source 
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
parent a259ad354f 15279f769d
commit 5ff7a9e793
6 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scene/resources/dpi_texture.cpp
View File

@@ -204,14 +204,14 @@ RID DPITexture::_load_at_scale(double p_scale, bool p_set_size) const {
}
Size2 current_size = size;
if (p_set_size) {
size.x = img->get_width();
base_size.x = img->get_width();
if (p_set_size || size.is_zero_approx()) {
size.x = img->get_width() / p_scale;
base_size.x = size.x;
if (size_override.x != 0) {
size.x = size_override.x;
}
size.y = img->get_height();
base_size.y = img->get_height();
size.y = img->get_height() / p_scale;
base_size.y = size.y;
if (size_override.y != 0) {
size.y = size_override.y;
}
@@ -274,19 +274,16 @@ bool DPITexture::has_alpha() const {
}
RID DPITexture::get_scaled_rid() const {
double scale = 1.0;
CanvasItem *ci = CanvasItem::get_current_item_drawn();
if (ci) {
Viewport *vp = ci->get_viewport();
if (vp) {
scale = vp->get_oversampling();
}
double scale = TextServer::get_current_drawn_item_oversampling();
if (scale == 0.0) {
scale = 1.0;
}
return _ensure_scale(scale);
}
void DPITexture::draw(RID p_canvas_item, const Point2 &p_pos, const Color &p_modulate, bool p_transpose) const {
RenderingServer::get_singleton()->canvas_item_add_texture_rect(p_canvas_item, Rect2(p_pos, size), get_scaled_rid(), false, p_modulate, p_transpose);
RID rid = get_scaled_rid(); // Note: call `get_scaled_rid` before using `size` to ensure it is loaded.
RenderingServer::get_singleton()->canvas_item_add_texture_rect(p_canvas_item, Rect2(p_pos, size), rid, false, p_modulate, p_transpose);
}
void DPITexture::draw_rect(RID p_canvas_item, const Rect2 &p_rect, bool p_tile, const Color &p_modulate, bool p_transpose) const {

10
scene/resources/style_box_flat.cpp
View File

@@ -496,13 +496,9 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const {
real_t aa_size_scaled = 1.0f;
if (aa_on) {
real_t scale_factor = 1.0f;
CanvasItem *ci = CanvasItem::get_current_item_drawn();
if (ci) {
Viewport *vp = ci->get_viewport();
if (vp) {
scale_factor = vp->get_oversampling();
}
real_t scale_factor = TextServer::get_current_drawn_item_oversampling();
if (scale_factor == 0.0) {
scale_factor = 1.0;
}
// Adjust AA feather size to account for the 2D scale factor, so that