From 95eb7466df890dcbed9eb8e8bda15bd9235db9c0 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 11 Sep 2016 11:28:01 -0300 Subject: [PATCH] -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 --- scene/gui/color_rect.cpp | 36 +++++ scene/gui/color_rect.h | 22 +++ scene/gui/control.cpp | 2 +- scene/gui/panel.h | 2 + scene/gui/text_edit.cpp | 3 +- scene/register_scene_types.cpp | 2 + tools/editor/code_editor.cpp | 6 +- tools/editor/icons/icon_color_frame.png | Bin 0 -> 360 bytes tools/editor/plugins/script_text_editor.cpp | 146 ++++++++++++++++++++ tools/editor/plugins/script_text_editor.h | 5 + 10 files changed, 220 insertions(+), 4 deletions(-) create mode 100644 scene/gui/color_rect.cpp create mode 100644 scene/gui/color_rect.h create mode 100644 tools/editor/icons/icon_color_frame.png diff --git a/scene/gui/color_rect.cpp b/scene/gui/color_rect.cpp new file mode 100644 index 00000000000..a0e4df66b5b --- /dev/null +++ b/scene/gui/color_rect.cpp @@ -0,0 +1,36 @@ +#include "color_rect.h" + + + + +void ColorFrame::set_frame_color(const Color& p_color) { + + color=p_color; + update(); +} + +Color ColorFrame::get_frame_color() const{ + + return color; +} + +void ColorFrame::_notification(int p_what) { + + if (p_what==NOTIFICATION_DRAW) { + draw_rect(Rect2(Point2(),get_size()),color); + } +} + +void ColorFrame::_bind_methods() { + + ObjectTypeDB::bind_method(_MD("set_frame_color","color"),&ColorFrame::set_frame_color); + ObjectTypeDB::bind_method(_MD("get_frame_color"),&ColorFrame::get_frame_color); + + ADD_PROPERTY(PropertyInfo(Variant::COLOR,"color"),_SCS("set_frame_color"),_SCS("get_frame_color") ); +} + +ColorFrame::ColorFrame() { + + color=Color(1,1,1); +} + diff --git a/scene/gui/color_rect.h b/scene/gui/color_rect.h new file mode 100644 index 00000000000..3816d440521 --- /dev/null +++ b/scene/gui/color_rect.h @@ -0,0 +1,22 @@ +#ifndef COLORRECT_H +#define COLORRECT_H + +#include "scene/gui/control.h" + +class ColorFrame : public Control { + OBJ_TYPE(ColorFrame,Control) + + Color color; +protected: + + void _notification(int p_what); + static void _bind_methods(); +public: + + void set_frame_color(const Color& p_color); + Color get_frame_color() const; + + ColorFrame(); +}; + +#endif // COLORRECT_H diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index c120be65d07..269bd09b178 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -1924,7 +1924,7 @@ void Control::_propagate_theme_changed(CanvasItem *p_at,Control *p_owner,bool p_ if (p_assign) { c->data.theme_owner=p_owner; } - c->_notification(NOTIFICATION_THEME_CHANGED); + c->notification(NOTIFICATION_THEME_CHANGED); c->update(); } } diff --git a/scene/gui/panel.h b/scene/gui/panel.h index efa9ebcaa07..9e2e7df7f06 100644 --- a/scene/gui/panel.h +++ b/scene/gui/panel.h @@ -45,4 +45,6 @@ public: }; + + #endif diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 4756fdee265..87df8c076e1 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) { diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index d22c3bad140..104aeb2b5ee 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -55,6 +55,7 @@ #include "scene/gui/option_button.h" #include "scene/gui/color_picker.h" #include "scene/gui/texture_frame.h" +#include "scene/gui/color_rect.h" #include "scene/gui/patch_9_frame.h" #include "scene/gui/menu_button.h" #include "scene/gui/check_box.h" @@ -339,6 +340,7 @@ void register_scene_types() { OS::get_singleton()->yield(); //may take time to init ObjectTypeDB::register_type(); + ObjectTypeDB::register_type(); ObjectTypeDB::register_type(); ObjectTypeDB::register_type(); ObjectTypeDB::register_type(); diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp index 9bf7d05ae89..9240e3527ca 100644 --- a/tools/editor/code_editor.cpp +++ b/tools/editor/code_editor.cpp @@ -1128,8 +1128,10 @@ void CodeTextEditor::_update_font() { font_overridden = true; } } - if(!font_overridden) + if(!font_overridden) { + text_editor->add_font_override("font",get_font("source","EditorFonts")); + } } void CodeTextEditor::_on_settings_change() { @@ -1168,7 +1170,7 @@ void CodeTextEditor::_notification(int p_what) { _load_theme_settings(); emit_signal("load_theme_settings"); } - if (p_what==NOTIFICATION_ENTER_TREE) { + if (p_what==NOTIFICATION_THEME_CHANGED) { _update_font(); } } diff --git a/tools/editor/icons/icon_color_frame.png b/tools/editor/icons/icon_color_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..a82eefc10a6dc313ca4f637fda6dc7b7dc5468c3 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNCpWJWljG9|yg;F^o-U3d7N?I++UwVxAksF!|Hs9J zFBJ|hRT4iK!nVGl(N%r!PPJ;r-fljg-tYxEJ$-yr3?4qeP{J@tj@>!g+>bmd6^F{Aa+V+MUiH^Ks>b%@ zgjeOy&0qaLe}nlH4*^)4%{=@O1TaS?83{1OWJ= BkPQF; literal 0 HcmV?d00001 diff --git a/tools/editor/plugins/script_text_editor.cpp b/tools/editor/plugins/script_text_editor.cpp index 57cf8cbea32..69f4c9d9a63 100644 --- a/tools/editor/plugins/script_text_editor.cpp +++ b/tools/editor/plugins/script_text_editor.cpp @@ -30,6 +30,7 @@ #include "tools/editor/editor_settings.h" #include "os/keyboard.h" #include "tools/editor/script_editor_debugger.h" +#include "tools/editor/editor_node.h" Vector ScriptTextEditor::get_functions() { @@ -920,6 +921,10 @@ void ScriptTextEditor::_bind_methods() { ObjectTypeDB::bind_method("_edit_option",&ScriptTextEditor::_edit_option); ObjectTypeDB::bind_method("_goto_line",&ScriptTextEditor::_goto_line); + ObjectTypeDB::bind_method("get_drag_data_fw",&ScriptTextEditor::get_drag_data_fw); + ObjectTypeDB::bind_method("can_drop_data_fw",&ScriptTextEditor::can_drop_data_fw); + ObjectTypeDB::bind_method("drop_data_fw",&ScriptTextEditor::drop_data_fw); + ADD_SIGNAL(MethodInfo("name_changed")); ADD_SIGNAL(MethodInfo("request_help_search",PropertyInfo(Variant::STRING,"topic"))); } @@ -957,6 +962,144 @@ void ScriptTextEditor::set_debugger_active(bool p_active) { } + +Variant ScriptTextEditor::get_drag_data_fw(const Point2& p_point,Control* p_from) { + + return Variant(); +} + +bool ScriptTextEditor::can_drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from) const{ + + Dictionary d = p_data; + if (d.has("type") && + ( + + String(d["type"])=="resource" || + String(d["type"])=="files" || + String(d["type"])=="nodes" + ) ) { + + + return true; + } + + + return false; + +} + +#ifdef TOOLS_ENABLED + +static Node* _find_script_node(Node* p_edited_scene,Node* p_current_node,const Ref