Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove Viewport::_get_input_pre_xform

Browse source 
This function is only relevant for `Window`. So this PR moves
the functionality to the `Window`-class.
This commit is contained in:
Markus Sauermann 2023-02-02 19:28:14 +01:00
parent a16b0fec40
commit e3e9da78e8
4 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scene/main/window.cpp
View file

@ -2115,13 +2115,17 @@ bool Window::is_auto_translating() const {
return auto_translate;
}
Transform2D Window::get_final_transform() const {
return window_transform * stretch_transform * global_canvas_transform;
}
Transform2D Window::get_screen_transform() const {
Transform2D embedder_transform;
if (_get_embedder()) {
embedder_transform.translate_local(get_position());
embedder_transform = _get_embedder()->get_screen_transform() * embedder_transform;
}
return embedder_transform * Viewport::get_screen_transform();
return embedder_transform * get_final_transform();
}
Transform2D Window::get_popup_base_transform() const {
@ -2130,7 +2134,7 @@ Transform2D Window::get_popup_base_transform() const {
}
Transform2D popup_base_transform;
popup_base_transform.set_origin(get_position());
popup_base_transform *= Viewport::get_screen_transform();
popup_base_transform *= get_final_transform();
if (_get_embedder()) {
return _get_embedder()->get_popup_base_transform() * popup_base_transform;
}