summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/control.cpp2
-rw-r--r--scene/gui/dialogs.cpp1
-rw-r--r--scene/gui/text_edit.cpp1
3 files changed, 3 insertions, 1 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index ccc658b0aa..92e740889d 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2286,7 +2286,7 @@ void Control::set_theme(const Ref<Theme> &p_theme) {
}
if (data.theme.is_valid()) {
- data.theme->connect("changed", this, "_theme_changed");
+ data.theme->connect("changed", this, "_theme_changed", varray(), CONNECT_DEFERRED);
}
}
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index b6e647d1af..cc2d5dd6ea 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -35,6 +35,7 @@
#ifdef TOOLS_ENABLED
#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
#include "scene/main/viewport.h" // Only used to check for more modals when dimming the editor.
#endif
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 9bcacd6ee3..2c4c7bdebe 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -1946,6 +1946,7 @@ void TextEdit::indent_right() {
// Ignore if the cursor is not past the first column.
if (is_selection_active() && get_selection_to_column() == 0) {
+ selection_offset = 0;
end_line--;
}