1
0
mirror of https://github.com/godotengine/godot.git synced 2025-12-06 17:25:19 +00:00

-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
This commit is contained in:
Juan Linietsky
2016-09-11 11:28:01 -03:00
parent 1bf684cea2
commit 95eb7466df
10 changed files with 220 additions and 4 deletions

View File

@@ -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) {