diff options
| author | Juan Linietsky | 2016-09-11 11:28:01 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-09-11 11:28:01 -0300 |
| commit | 95eb7466df890dcbed9eb8e8bda15bd9235db9c0 (patch) | |
| tree | 6c23afb3abef8e539c42d1024a0fa213bc98692b /scene/gui/text_edit.cpp | |
| parent | 1bf684cea274db7c58b3f62a77ad4de3980c14dc (diff) | |
| download | godot-95eb7466df890dcbed9eb8e8bda15bd9235db9c0.tar.gz godot-95eb7466df890dcbed9eb8e8bda15bd9235db9c0.tar.zst godot-95eb7466df890dcbed9eb8e8bda15bd9235db9c0.zip | |
-Added a ColorFrame control, kind of like Texture but for color.
-Added dropping nodes to text editor for them to become a path
-Fixed issues with font not properly being set in code editor
Diffstat (limited to 'scene/gui/text_edit.cpp')
| -rw-r--r-- | scene/gui/text_edit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 4756fdee2..87df8c076 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -34,6 +34,7 @@ #include "globals.h" #include "message_queue.h" +#include "scene/main/viewport.h" #define TAB_PIXELS @@ -1651,7 +1652,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { const InputEventMouseMotion &mm=p_input_event.mouse_motion; - if (mm.button_mask&BUTTON_MASK_LEFT) { + if (mm.button_mask&BUTTON_MASK_LEFT && get_viewport()->gui_get_drag_data()==Variant()) { //ignore if dragging if (selection.selecting_mode!=Selection::MODE_NONE) { |