Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 13:49:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #110080 from bruvzg/popscwpc

Browse source 
[GraphEdit] Do not scale popup menus in the graph elements when zoomed.
This commit is contained in:
Rémi Verschelde 2025-12-05 12:55:44 +01:00
commit 6b420d701a
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/classes/GraphElement.xml
View file

@ -19,6 +19,9 @@
If [code]true[/code], the user can resize the GraphElement.
[b]Note:[/b] Dragging the handle will only emit the [signal resize_request] and [signal resize_end] signals, the GraphElement needs to be resized manually.
</member>
<member name="scaling_menus" type="bool" setter="set_scaling_menus" getter="is_scaling_menus" default="false">
If [code]true[/code], [PopupMenu]s that are descendants of the GraphElement are scaled with the [GraphEdit] zoom.
</member>
<member name="selectable" type="bool" setter="set_selectable" getter="is_selectable" default="true">
If [code]true[/code], the user can select the GraphElement.
</member>

12
scene/gui/graph_element.cpp
View file

@ -213,6 +213,14 @@ bool GraphElement::is_selectable() {
return selectable;
}
void GraphElement::set_scaling_menus(bool p_scaling_menus) {
scaling_menus = p_scaling_menus;
}
bool GraphElement::is_scaling_menus() const {
return scaling_menus;
}
void GraphElement::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_resizable", "resizable"), &GraphElement::set_resizable);
ClassDB::bind_method(D_METHOD("is_resizable"), &GraphElement::is_resizable);
@ -226,6 +234,9 @@ void GraphElement::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_selected", "selected"), &GraphElement::set_selected);
ClassDB::bind_method(D_METHOD("is_selected"), &GraphElement::is_selected);
ClassDB::bind_method(D_METHOD("set_scaling_menus", "scaling_menus"), &GraphElement::set_scaling_menus);
ClassDB::bind_method(D_METHOD("is_scaling_menus"), &GraphElement::is_scaling_menus);
ClassDB::bind_method(D_METHOD("set_position_offset", "offset"), &GraphElement::set_position_offset);
ClassDB::bind_method(D_METHOD("get_position_offset"), &GraphElement::get_position_offset);
@ -234,6 +245,7 @@ void GraphElement::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draggable"), "set_draggable", "is_draggable");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "selectable"), "set_selectable", "is_selectable");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "selected"), "set_selected", "is_selected");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "scaling_menus"), "set_scaling_menus", "is_scaling_menus");
ADD_SIGNAL(MethodInfo("node_selected"));
ADD_SIGNAL(MethodInfo("node_deselected"));

5
scene/gui/graph_element.h
View file

@ -48,6 +48,8 @@ protected:
Vector2 position_offset;
bool scaling_menus = false;
struct ThemeCache {
Ref<Texture2D> resizer;
} theme_cache;
@ -84,6 +86,9 @@ public:
void set_selectable(bool p_selectable);
bool is_selectable();
void set_scaling_menus(bool p_scaling_menus);
bool is_scaling_menus() const;
virtual Size2 get_minimum_size() const override;
bool is_resizing() const {

20
scene/gui/popup_menu.cpp
View file

@ -35,6 +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/menu_bar.h"
#include "scene/gui/panel_container.h"
#include "scene/main/timer.h"
@ -3372,12 +3373,29 @@ void PopupMenu::_popup_base(const Rect2i &p_bounds) {
}
void PopupMenu::_pre_popup() {
real_t popup_scale = 1.0;
bool scale_with_parent = true;
// 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;
}
p = p->get_parent();
}
if (scale_with_parent) {
Size2 scale = get_force_native() ? get_parent_viewport()->get_popup_base_transform_native().get_scale() : get_parent_viewport()->get_popup_base_transform().get_scale();
CanvasItem *c = Object::cast_to<CanvasItem>(get_parent());
if (c) {
scale *= c->get_global_transform_with_canvas().get_scale();
}
real_t popup_scale = MIN(scale.x, scale.y);
popup_scale = MIN(scale.x, scale.y);
}
set_content_scale_factor(popup_scale);
if (is_wrapping_controls()) {
Size2 minsize = get_contents_minimum_size() * popup_scale;