Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #115620 from bruvzg/gn_scale

Browse source 
[PopupMenu] Use parent `GraphEdit` scale for popups inside `GraphElement` instead of completely disabling it.
This commit is contained in:
Thaddeus Crews 2026-01-30 09:32:06 -06:00
commit 2d9b67e7bf
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

37
scene/gui/popup_menu.cpp
View file

@ -35,7 +35,7 @@
#include "core/input/input.h"
#include "core/os/keyboard.h"
#include "core/os/os.h"
#include "scene/gui/graph_element.h"
#include "scene/gui/graph_edit.h"
#include "scene/gui/menu_bar.h"
#include "scene/gui/panel_container.h"
#include "scene/main/timer.h"
@ -3435,22 +3435,37 @@ bool PopupMenu::get_shrink_width() const {
void PopupMenu::_pre_popup() {
real_t popup_scale = 1.0;
bool scale_with_parent = true;
Node *parent_node = get_parent();
// Disable content scaling to avoid too tiny or too big menus when using GraphEdit zoom, applied only if menu is a child of GraphElement.
Node *p = get_parent();
while (p) {
GraphElement *ge = Object::cast_to<GraphElement>(p);
if (ge) {
scale_with_parent = ge->is_scaling_menus();
break;
// Use parent GraphEdit content scale to avoid too tiny or too big menus when using GraphEdit zoom, applied only if menu is a child of GraphElement.
{
Node *p = parent_node;
while (p) {
GraphElement *gelement = Object::cast_to<GraphElement>(p);
if (gelement) {
scale_with_parent = gelement->is_scaling_menus();
if (!scale_with_parent) {
parent_node = nullptr;
p = gelement->get_parent();
while (p) {
GraphEdit *gedit = Object::cast_to<GraphEdit>(p);
if (gedit) {
parent_node = gedit;
break;
}
p = p->get_parent();
}
}
break;
}
p = p->get_parent();
}
p = p->get_parent();
}
Viewport *vp = get_parent_viewport();
if (scale_with_parent && vp) {
if (vp && parent_node) {
Size2 scale = is_embedded() ? vp->get_popup_base_transform().get_scale() : vp->get_popup_base_transform_native().get_scale();
CanvasItem *c = Object::cast_to<CanvasItem>(get_parent());
CanvasItem *c = Object::cast_to<CanvasItem>(parent_node);
if (c) {
scale *= c->get_global_transform_with_canvas().get_scale();
}