godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Improve Popup content_scale_factor

Browse Source
This commit is contained in:
scgm0
2025-03-20 17:02:19 +08:00
parent 594d64ec24
commit 27438a1b9d
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scene/gui/popup_menu.cpp
View File

@@ -3036,14 +3036,18 @@ void PopupMenu::popup(const Rect2i &p_bounds) {
moved = Vector2(); moved = Vector2();
popup_time_msec = OS::get_singleton()->get_ticks_msec(); popup_time_msec = OS::get_singleton()->get_ticks_msec();
if (!is_embedded()) {
float win_scale = get_parent_visible_window()->get_content_scale_factor(); Size2 scale = get_parent_viewport()->get_popup_base_transform().get_scale();
set_content_scale_factor(win_scale); CanvasItem *c = Object::cast_to<CanvasItem>(get_parent());
Size2 minsize = get_contents_minimum_size() * win_scale; if (c) {
minsize.height = Math::ceil(minsize.height); // Ensures enough height at fractional content scales to prevent the v_scroll_bar from showing. scale *= c->get_global_transform_with_canvas().get_scale();
set_min_size(minsize); // `height` is truncated here by the cast to Size2i for Window.min_size.
set_size(Vector2(0, 0)); // Shrinkwraps to min size.
} }
real_t popup_scale = MIN(scale.x, scale.y);
set_content_scale_factor(popup_scale);
Size2 minsize = get_contents_minimum_size() * popup_scale;
minsize.height = Math::ceil(minsize.height); // Ensures enough height at fractional content scales to prevent the v_scroll_bar from showing.
set_min_size(minsize); // `height` is truncated here by the cast to Size2i for Window.min_size.
set_size(Vector2(0, 0)); // Shrinkwraps to min size.
Popup::popup(p_bounds); Popup::popup(p_bounds);
} }
} }

4
scene/gui/tree.cpp
View File

@@ -4092,7 +4092,9 @@ bool Tree::edit_selected(bool p_force_edit) {
return false; return false;
} }
real_t popup_scale = popup_editor->is_embedded() ? 1.0 : popup_editor->get_parent_visible_window()->get_content_scale_factor(); Size2 scale = popup_editor->get_parent_viewport()->get_popup_base_transform().get_scale() * get_global_transform_with_canvas().get_scale();
real_t popup_scale = MIN(scale.x, scale.y);
Rect2 rect = _get_item_focus_rect(s); Rect2 rect = _get_item_focus_rect(s);
rect.position *= popup_scale; rect.position *= popup_scale;
popup_edited_item = s; popup_edited_item = s;

11
scene/main/viewport.cpp
View File

@@ -1562,20 +1562,19 @@ void Viewport::_gui_show_tooltip() {
if (!window) { // Not embedded. if (!window) { // Not embedded.
window = gui.tooltip_popup->get_parent_visible_window(); window = gui.tooltip_popup->get_parent_visible_window();
} }
float win_scale = window->content_scale_factor; Size2 scale = get_popup_base_transform().get_scale();
real_t popup_scale = MIN(scale.x, scale.y);
Point2 tooltip_offset = GLOBAL_GET("display/mouse_cursor/tooltip_position_offset"); Point2 tooltip_offset = GLOBAL_GET("display/mouse_cursor/tooltip_position_offset");
if (!gui.tooltip_popup->is_embedded()) { tooltip_offset *= popup_scale;
tooltip_offset *= win_scale;
}
Rect2 r(gui.tooltip_pos + tooltip_offset, gui.tooltip_popup->get_contents_minimum_size()); Rect2 r(gui.tooltip_pos + tooltip_offset, gui.tooltip_popup->get_contents_minimum_size());
Rect2i vr; Rect2i vr;
if (gui.tooltip_popup->is_embedded()) { if (gui.tooltip_popup->is_embedded()) {
vr = gui.tooltip_popup->get_embedder()->get_visible_rect(); vr = gui.tooltip_popup->get_embedder()->get_visible_rect();
} else { } else {
panel->content_scale_factor = win_scale;
r.size *= win_scale;
vr = window->get_usable_parent_rect(); vr = window->get_usable_parent_rect();
} }
panel->content_scale_factor = popup_scale;
r.size *= popup_scale;
r.size = r.size.ceil(); r.size = r.size.ceil();
r.size = r.size.min(panel->get_max_size()); r.size = r.size.min(panel->get_max_size());