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

Fix scale and position of popups with force_native.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-06-15 17:18:03 +03:00
parent 46c495ca21
commit 34a97f9c9b
6 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/menu_button.cpp
View File

@@ -81,6 +81,10 @@ void MenuButton::show_popup() {
emit_signal(SNAME("about_to_popup")); emit_signal(SNAME("about_to_popup"));
Rect2 rect = get_screen_rect(); Rect2 rect = get_screen_rect();
rect.position.y += rect.size.height; rect.position.y += rect.size.height;
if (get_viewport()->is_embedding_subwindows() && popup->get_force_native()) {
Transform2D xform = get_viewport()->get_popup_base_transform_native();
rect = xform.xform(rect);
}
rect.size.height = 0; rect.size.height = 0;
popup->set_size(rect.size); popup->set_size(rect.size);
if (is_layout_rtl()) { if (is_layout_rtl()) {

4
scene/gui/option_button.cpp
View File

@@ -541,6 +541,10 @@ void OptionButton::show_popup() {
Rect2 rect = get_screen_rect(); Rect2 rect = get_screen_rect();
rect.position.y += rect.size.height; rect.position.y += rect.size.height;
if (get_viewport()->is_embedding_subwindows() && popup->get_force_native()) {
Transform2D xform = get_viewport()->get_popup_base_transform_native();
rect = xform.xform(rect);
}
rect.size.height = 0; rect.size.height = 0;
popup->popup(rect); popup->popup(rect);
} }

2
scene/gui/popup_menu.cpp
View File

@@ -3216,7 +3216,7 @@ void PopupMenu::popup(const Rect2i &p_bounds) {
} }
void PopupMenu::_pre_popup() { void PopupMenu::_pre_popup() {
Size2 scale = get_parent_viewport()->get_popup_base_transform().get_scale(); 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()); CanvasItem *c = Object::cast_to<CanvasItem>(get_parent());
if (c) { if (c) {
scale *= c->get_global_transform_with_canvas().get_scale(); scale *= c->get_global_transform_with_canvas().get_scale();

1
scene/main/viewport.h
View File

@@ -730,6 +730,7 @@ public:
Transform2D get_screen_transform() const; Transform2D get_screen_transform() const;
virtual Transform2D get_screen_transform_internal(bool p_absolute_position = false) const; virtual Transform2D get_screen_transform_internal(bool p_absolute_position = false) const;
virtual Transform2D get_popup_base_transform_native() const { return Transform2D(); }
virtual Transform2D get_popup_base_transform() const { return Transform2D(); } virtual Transform2D get_popup_base_transform() const { return Transform2D(); }
virtual Viewport *get_section_root_viewport() const { return nullptr; } virtual Viewport *get_section_root_viewport() const { return nullptr; }
virtual bool is_attached_in_viewport() const { return false; } virtual bool is_attached_in_viewport() const { return false; }

14
scene/main/window.cpp
View File

@@ -3028,6 +3028,20 @@ Transform2D Window::get_screen_transform_internal(bool p_absolute_position) cons
return embedder_transform * get_final_transform(); return embedder_transform * get_final_transform();
} }
Transform2D Window::get_popup_base_transform_native() const {
ERR_READ_THREAD_GUARD_V(Transform2D());
if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SUBWINDOWS)) {
return Transform2D();
}
Transform2D popup_base_transform;
popup_base_transform.set_origin(get_position());
popup_base_transform *= get_final_transform();
if (get_embedder()) {
return get_embedder()->get_popup_base_transform_native() * popup_base_transform;
}
return popup_base_transform;
}
Transform2D Window::get_popup_base_transform() const { Transform2D Window::get_popup_base_transform() const {
ERR_READ_THREAD_GUARD_V(Transform2D()); ERR_READ_THREAD_GUARD_V(Transform2D());
if (is_embedding_subwindows()) { if (is_embedding_subwindows()) {

1
scene/main/window.h
View File

@@ -509,6 +509,7 @@ public:
virtual Transform2D get_final_transform() const override; virtual Transform2D get_final_transform() const override;
virtual Transform2D get_screen_transform_internal(bool p_absolute_position = false) const override; virtual Transform2D get_screen_transform_internal(bool p_absolute_position = false) const override;
virtual Transform2D get_popup_base_transform() const override; virtual Transform2D get_popup_base_transform() const override;
virtual Transform2D get_popup_base_transform_native() const override;
virtual Viewport *get_section_root_viewport() const override; virtual Viewport *get_section_root_viewport() const override;
virtual bool is_attached_in_viewport() const override; virtual bool is_attached_in_viewport() const override;