summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-01-18 10:53:19 +0100
committerGitHub <noreply@github.com>2022-01-18 10:53:19 +0100
commit453f4dbe46158fce959ab366d29514430fd40f03 (patch)
treedacec5f6b4481932c420ea58477386ab7584ed03 /scene
parent38a54084bec22a51054c4410e193f69a6488a13a (diff)
parenta5a03b3a73e4d466555e564f31b2a64e3058af72 (diff)
Merge pull request #56874 from MarioLiebisch/fix-56869
Diffstat (limited to 'scene')
-rw-r--r--scene/main/viewport.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 4ad250ff54..2cdafefba7 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -2348,7 +2348,7 @@ void Viewport::push_text_input(const String &p_text) {
}
Viewport::SubWindowResize Viewport::_sub_window_get_resize_margin(Window *p_subwindow, const Point2 &p_point) {
- if (p_subwindow->get_flag(Window::FLAG_BORDERLESS)) {
+ if (p_subwindow->get_flag(Window::FLAG_BORDERLESS) || p_subwindow->get_flag(Window::FLAG_RESIZE_DISABLED)) {
return SUB_WINDOW_RESIZE_DISABLED;
}