summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/box_container.cpp4
-rw-r--r--scene/gui/control.cpp102
-rw-r--r--scene/gui/empty_control.cpp59
-rw-r--r--scene/gui/empty_control.h48
-rw-r--r--scene/gui/graph_edit.cpp586
-rw-r--r--scene/gui/graph_edit.h100
-rw-r--r--scene/gui/graph_node.cpp583
-rw-r--r--scene/gui/graph_node.h101
-rw-r--r--scene/gui/menu_button.cpp1
-rw-r--r--scene/gui/popup.cpp15
-rw-r--r--scene/gui/popup_menu.cpp19
-rw-r--r--scene/gui/popup_menu.h4
-rw-r--r--scene/gui/tab_container.cpp33
-rw-r--r--scene/gui/tab_container.h2
-rw-r--r--scene/gui/text_edit.cpp6079
-rw-r--r--scene/gui/text_edit.h19
-rw-r--r--scene/gui/texture_button.cpp81
-rw-r--r--scene/gui/texture_button.h7
18 files changed, 4787 insertions, 3056 deletions
diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp
index 216c6d7122..5ed60e88f8 100644
--- a/scene/gui/box_container.cpp
+++ b/scene/gui/box_container.cpp
@@ -44,7 +44,7 @@ void BoxContainer::_resort() {
Size2i new_size=get_size();;
- int sep=get_constant("separation",vertical?"VBoxContainer":"HBoxContainer");
+ int sep=get_constant("separation");//,vertical?"VBoxContainer":"HBoxContainer");
bool first=true;
int children_count=0;
@@ -202,7 +202,7 @@ Size2 BoxContainer::get_minimum_size() const {
/* Calculate MINIMUM SIZE */
Size2i minimum;
- int sep=get_constant("separation",vertical?"VBoxContainer":"HBoxContainer");
+ int sep=get_constant("separation");//,vertical?"VBoxContainer":"HBoxContainer");
bool first=true;
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index aea0aacf42..ce268843b1 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -1126,6 +1126,7 @@ void Control::_window_input_event(InputEvent p_event) {
over = _find_control_at_pos(this,pos,parent_xform,window->focus_inv_xform);
}
+
if (window->drag_data.get_type()==Variant::NIL && over && !window->modal_stack.empty()) {
Control *top = window->modal_stack.back()->get();
@@ -1325,9 +1326,12 @@ Size2 Control::get_minimum_size() const {
Ref<Texture> Control::get_icon(const StringName& p_name,const StringName& p_type) const {
- const Ref<Texture>* tex = data.icon_override.getptr(p_name);
- if (tex)
- return *tex;
+ if (p_type==StringName()) {
+
+ const Ref<Texture>* tex = data.icon_override.getptr(p_name);
+ if (tex)
+ return *tex;
+ }
StringName type = p_type?p_type:get_type_name();
@@ -1353,12 +1357,11 @@ Ref<Texture> Control::get_icon(const StringName& p_name,const StringName& p_type
Ref<StyleBox> Control::get_stylebox(const StringName& p_name,const StringName& p_type) const {
-
- const Ref<StyleBox>* style = data.style_override.getptr(p_name);
-
-
- if (style)
- return *style;
+ if (p_type==StringName()) {
+ const Ref<StyleBox>* style = data.style_override.getptr(p_name);
+ if (style)
+ return *style;
+ }
StringName type = p_type?p_type:get_type_name();
@@ -1381,10 +1384,12 @@ Ref<StyleBox> Control::get_stylebox(const StringName& p_name,const StringName& p
}
Ref<Font> Control::get_font(const StringName& p_name,const StringName& p_type) const {
-
- const Ref<Font>* font = data.font_override.getptr(p_name);
- if (font)
- return *font;
+
+ if (p_type==StringName()) {
+ const Ref<Font>* font = data.font_override.getptr(p_name);
+ if (font)
+ return *font;
+ }
StringName type = p_type?p_type:get_type_name();
@@ -1410,10 +1415,12 @@ Ref<Font> Control::get_font(const StringName& p_name,const StringName& p_type) c
}
Color Control::get_color(const StringName& p_name,const StringName& p_type) const {
-
- const Color* color = data.color_override.getptr(p_name);
- if (color)
- return *color;
+
+ if (p_type==StringName()) {
+ const Color* color = data.color_override.getptr(p_name);
+ if (color)
+ return *color;
+ }
StringName type = p_type?p_type:get_type_name();
// try with custom themes
@@ -1437,10 +1444,12 @@ Color Control::get_color(const StringName& p_name,const StringName& p_type) cons
}
int Control::get_constant(const StringName& p_name,const StringName& p_type) const {
-
- const int* constant = data.constant_override.getptr(p_name);
- if (constant)
- return *constant;
+
+ if (p_type==StringName()) {
+ const int* constant = data.constant_override.getptr(p_name);
+ if (constant)
+ return *constant;
+ }
StringName type = p_type?p_type:get_type_name();
// try with custom themes
@@ -1467,9 +1476,11 @@ int Control::get_constant(const StringName& p_name,const StringName& p_type) con
bool Control::has_icon(const StringName& p_name,const StringName& p_type) const {
- const Ref<Texture>* tex = data.icon_override.getptr(p_name);
- if (tex)
- return true;
+ if (p_type==StringName()) {
+ const Ref<Texture>* tex = data.icon_override.getptr(p_name);
+ if (tex)
+ return true;
+ }
StringName type = p_type?p_type:get_type_name();
@@ -1494,11 +1505,12 @@ bool Control::has_icon(const StringName& p_name,const StringName& p_type) const
}
bool Control::has_stylebox(const StringName& p_name,const StringName& p_type) const {
-
- const Ref<StyleBox>* style = data.style_override.getptr(p_name);
-
- if (style)
- return true;
+ if (p_type==StringName()) {
+ const Ref<StyleBox>* style = data.style_override.getptr(p_name);
+
+ if (style)
+ return true;
+ }
StringName type = p_type?p_type:get_type_name();
@@ -1523,9 +1535,11 @@ bool Control::has_stylebox(const StringName& p_name,const StringName& p_type) co
}
bool Control::has_font(const StringName& p_name,const StringName& p_type) const {
- const Ref<Font>* font = data.font_override.getptr(p_name);
- if (font)
- return true;
+ if (p_type==StringName()) {
+ const Ref<Font>* font = data.font_override.getptr(p_name);
+ if (font)
+ return true;
+ }
StringName type = p_type?p_type:get_type_name();
@@ -1551,9 +1565,11 @@ bool Control::has_font(const StringName& p_name,const StringName& p_type) const
}
bool Control::has_color(const StringName& p_name,const StringName& p_type) const {
- const Color* color = data.color_override.getptr(p_name);
- if (color)
- return true;
+ if (p_type==StringName()) {
+ const Color* color = data.color_override.getptr(p_name);
+ if (color)
+ return true;
+ }
StringName type = p_type?p_type:get_type_name();
@@ -1578,10 +1594,13 @@ bool Control::has_color(const StringName& p_name,const StringName& p_type) const
}
bool Control::has_constant(const StringName& p_name,const StringName& p_type) const {
-
- const int* constant = data.constant_override.getptr(p_name);
- if (constant)
- return true;
+
+ if (p_type==StringName()) {
+
+ const int* constant = data.constant_override.getptr(p_name);
+ if (constant)
+ return true;
+ }
StringName type = p_type?p_type:get_type_name();
@@ -2249,6 +2268,7 @@ void Control::_window_sort_subwindows() {
return;
window->modal_stack.sort_custom<CComparator>();
+ window->subwindows.sort_custom<CComparator>();
window->subwindow_order_dirty=false;
}
@@ -2664,8 +2684,8 @@ bool Control::is_stopping_mouse() const {
Control *Control::get_focus_owner() const {
ERR_FAIL_COND_V(!is_inside_tree(),NULL);
- ERR_FAIL_COND_V(!window,NULL);
- return window->key_focus;
+ ERR_FAIL_COND_V(!data.window,NULL);
+ return data.window->window->key_focus;
}
void Control::_bind_methods() {
diff --git a/scene/gui/empty_control.cpp b/scene/gui/empty_control.cpp
deleted file mode 100644
index 1e377b2b73..0000000000
--- a/scene/gui/empty_control.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************/
-/* empty_control.cpp */
-/*************************************************************************/
-/* This file is part of: */
-/* GODOT ENGINE */
-/* http://www.godotengine.org */
-/*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
-/* */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the */
-/* "Software"), to deal in the Software without restriction, including */
-/* without limitation the rights to use, copy, modify, merge, publish, */
-/* distribute, sublicense, and/or sell copies of the Software, and to */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions: */
-/* */
-/* The above copyright notice and this permission notice shall be */
-/* included in all copies or substantial portions of the Software. */
-/* */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-/*************************************************************************/
-#include "empty_control.h"
-
-Size2 EmptyControl::get_minimum_size() const {
-
- return minsize;
-}
-
-void EmptyControl::set_minsize(const Size2& p_size) {
-
- minsize=p_size;
- minimum_size_changed();
-}
-
-Size2 EmptyControl::get_minsize() const {
-
- return minsize;
-}
-
-
-void EmptyControl::_bind_methods() {
-
-
- ObjectTypeDB::bind_method(_MD("set_minsize","minsize"),&EmptyControl::set_minsize);
- ObjectTypeDB::bind_method(_MD("get_minsize"),&EmptyControl::get_minsize);
-
- ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"minsize"), _SCS("set_minsize"),_SCS("get_minsize") );
-}
-
-EmptyControl::EmptyControl()
-{
-}
diff --git a/scene/gui/empty_control.h b/scene/gui/empty_control.h
deleted file mode 100644
index 993af45ac4..0000000000
--- a/scene/gui/empty_control.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************/
-/* empty_control.h */
-/*************************************************************************/
-/* This file is part of: */
-/* GODOT ENGINE */
-/* http://www.godotengine.org */
-/*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
-/* */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the */
-/* "Software"), to deal in the Software without restriction, including */
-/* without limitation the rights to use, copy, modify, merge, publish, */
-/* distribute, sublicense, and/or sell copies of the Software, and to */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions: */
-/* */
-/* The above copyright notice and this permission notice shall be */
-/* included in all copies or substantial portions of the Software. */
-/* */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-/*************************************************************************/
-#ifndef EMPTY_CONTROL_H
-#define EMPTY_CONTROL_H
-
-#include "scene/gui/control.h"
-
-class EmptyControl : public Control {
-
- OBJ_TYPE(EmptyControl,Control);
- Size2 minsize;
-protected:
- static void _bind_methods();
-public:
- virtual Size2 get_minimum_size() const;
- void set_minsize(const Size2& p_size);
- Size2 get_minsize() const;
-
- EmptyControl();
-};
-
-#endif // EMPTY_CONTROL_H
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
new file mode 100644
index 0000000000..3cd0dd3d16
--- /dev/null
+++ b/scene/gui/graph_edit.cpp
@@ -0,0 +1,586 @@
+#include "graph_edit.h"
+#include "os/input.h"
+#include "os/keyboard.h"
+bool GraphEditFilter::has_point(const Point2& p_point) const {
+
+ return ge->_filter_input(p_point);
+}
+
+
+GraphEditFilter::GraphEditFilter(GraphEdit *p_edit) {
+
+ ge=p_edit;
+}
+
+
+Error GraphEdit::connect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port) {
+
+ if (is_node_connected(p_from,p_from_port,p_to,p_to_port))
+ return OK;
+ Connection c;
+ c.from=p_from;
+ c.from_port=p_from_port;
+ c.to=p_to;
+ c.to_port=p_to_port;
+ connections.push_back(c);
+ top_layer->update();
+
+ return OK;
+}
+
+bool GraphEdit::is_node_connected(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port) {
+
+ for(List<Connection>::Element *E=connections.front();E;E=E->next()) {
+
+ if (E->get().from==p_from && E->get().from_port==p_from_port && E->get().to==p_to && E->get().to_port==p_to_port)
+ return true;
+ }
+
+ return false;
+
+}
+
+void GraphEdit::disconnect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port){
+
+
+ for(List<Connection>::Element *E=connections.front();E;E=E->next()) {
+
+ if (E->get().from==p_from && E->get().from_port==p_from_port && E->get().to==p_to && E->get().to_port==p_to_port) {
+
+ connections.erase(E);
+ top_layer->update();
+ return;
+ }
+ }
+}
+
+void GraphEdit::get_connection_list(List<Connection> *r_connections) const {
+
+ *r_connections=connections;
+}
+
+
+void GraphEdit::_scroll_moved(double) {
+
+
+ _update_scroll_offset();
+ top_layer->update();
+}
+
+void GraphEdit::_update_scroll_offset() {
+
+ for(int i=0;i<get_child_count();i++) {
+
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
+
+ Point2 pos=gn->get_offset();
+ pos-=Point2(h_scroll->get_val(),v_scroll->get_val());
+ gn->set_pos(pos);
+ }
+
+}
+
+void GraphEdit::_update_scroll() {
+
+ if (updating)
+ return;
+
+ updating=true;
+ Rect2 screen;
+ for(int i=0;i<get_child_count();i++) {
+
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
+
+ Rect2 r;
+ r.pos=gn->get_offset();
+ r.size=gn->get_size();
+ screen = screen.merge(r);
+ }
+
+ screen.pos-=get_size();
+ screen.size+=get_size()*2.0;
+
+
+ h_scroll->set_min(screen.pos.x);
+ h_scroll->set_max(screen.pos.x+screen.size.x);
+ h_scroll->set_page(get_size().x);
+ if (h_scroll->get_max() - h_scroll->get_min() <= h_scroll->get_page())
+ h_scroll->hide();
+ else
+ h_scroll->show();
+
+ v_scroll->set_min(screen.pos.y);
+ v_scroll->set_max(screen.pos.y+screen.size.y);
+ v_scroll->set_page(get_size().y);
+
+ if (v_scroll->get_max() - v_scroll->get_min() <= v_scroll->get_page())
+ v_scroll->hide();
+ else
+ v_scroll->show();
+
+ _update_scroll_offset();
+ updating=false;
+}
+
+
+void GraphEdit::_graph_node_raised(Node* p_gn) {
+
+ GraphNode *gn=p_gn->cast_to<GraphNode>();
+ ERR_FAIL_COND(!gn);
+ gn->raise();
+ top_layer->raise();
+
+}
+
+
+void GraphEdit::_graph_node_moved(Node *p_gn) {
+
+ GraphNode *gn=p_gn->cast_to<GraphNode>();
+ ERR_FAIL_COND(!gn);
+
+ //gn->set_pos(gn->get_offset()+scroll_offset);
+
+ top_layer->update();
+}
+
+void GraphEdit::add_child_notify(Node *p_child) {
+
+ top_layer->call_deferred("raise"); //top layer always on top!
+ GraphNode *gn = p_child->cast_to<GraphNode>();
+ if (gn) {
+ gn->connect("offset_changed",this,"_graph_node_moved",varray(gn));
+ gn->connect("raise_request",this,"_graph_node_raised",varray(gn));
+ _graph_node_moved(gn);
+ gn->set_stop_mouse(false);
+ }
+}
+
+void GraphEdit::remove_child_notify(Node *p_child) {
+
+ top_layer->call_deferred("raise"); //top layer always on top!
+ GraphNode *gn = p_child->cast_to<GraphNode>();
+ if (gn) {
+ gn->disconnect("offset_changed",this,"_graph_node_moved");
+ gn->disconnect("raise_request",this,"_graph_node_raised");
+ }
+}
+
+void GraphEdit::_notification(int p_what) {
+
+ if (p_what==NOTIFICATION_READY) {
+ Size2 size = top_layer->get_size();
+ Size2 hmin = h_scroll->get_combined_minimum_size();
+ Size2 vmin = v_scroll->get_combined_minimum_size();
+
+ v_scroll->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_END,vmin.width);
+ v_scroll->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,0);
+ v_scroll->set_anchor_and_margin(MARGIN_TOP,ANCHOR_BEGIN,0);
+ v_scroll->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,0);
+
+ h_scroll->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,0);
+ h_scroll->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,0);
+ h_scroll->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,hmin.height);
+ h_scroll->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,0);
+
+ }
+ if (p_what==NOTIFICATION_DRAW) {
+ VS::get_singleton()->canvas_item_set_clip(get_canvas_item(),true);
+
+ }
+
+ if (p_what==NOTIFICATION_RESIZED) {
+ _update_scroll();
+ top_layer->update();
+ }
+}
+
+bool GraphEdit::_filter_input(const Point2& p_point) {
+
+ Ref<Texture> port =get_icon("port","GraphNode");
+
+ float grab_r=port->get_width()*0.5;
+ for(int i=get_child_count()-1;i>=0;i--) {
+
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
+
+ for(int j=0;j<gn->get_connection_output_count();j++) {
+
+ Vector2 pos = gn->get_connection_output_pos(j)+gn->get_pos();
+ if (pos.distance_to(p_point)<grab_r)
+ return true;
+
+
+ }
+
+ for(int j=0;j<gn->get_connection_input_count();j++) {
+
+ Vector2 pos = gn->get_connection_input_pos(j)+gn->get_pos();
+ if (pos.distance_to(p_point)<grab_r)
+ return true;
+
+
+ }
+
+ }
+
+ return false;
+}
+
+void GraphEdit::_top_layer_input(const InputEvent& p_ev) {
+
+ if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.button_index==BUTTON_LEFT && p_ev.mouse_button.pressed) {
+
+ Ref<Texture> port =get_icon("port","GraphNode");
+ Vector2 mpos(p_ev.mouse_button.x,p_ev.mouse_button.y);
+ float grab_r=port->get_width()*0.5;
+ for(int i=get_child_count()-1;i>=0;i--) {
+
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
+
+ for(int j=0;j<gn->get_connection_output_count();j++) {
+
+ Vector2 pos = gn->get_connection_output_pos(j)+gn->get_pos();
+ if (pos.distance_to(mpos)<grab_r) {
+
+ connecting=true;
+ connecting_from=gn->get_name();
+ connecting_index=j;
+ connecting_out=true;
+ connecting_type=gn->get_connection_output_type(j);
+ connecting_color=gn->get_connection_output_color(j);
+ connecting_target=false;
+ connecting_to=pos;
+ return;
+ }
+
+
+ }
+
+ for(int j=0;j<gn->get_connection_input_count();j++) {
+
+ Vector2 pos = gn->get_connection_input_pos(j)+gn->get_pos();
+
+ if (pos.distance_to(mpos)<grab_r) {
+
+ if (right_disconnects) {
+ //check disconnect
+ for (List<Connection>::Element*E=connections.front();E;E=E->next()) {
+
+ if (E->get().to==gn->get_name() && E->get().to_port==j) {
+
+ Node*fr = get_node(String(E->get().from));
+ if (fr && fr->cast_to<GraphNode>()) {
+
+ connecting_from=E->get().from;
+ connecting_index=E->get().from_port;
+ connecting_out=true;
+ connecting_type=fr->cast_to<GraphNode>()->get_connection_output_type(E->get().from_port);
+ connecting_color=fr->cast_to<GraphNode>()->get_connection_output_color(E->get().from_port);
+ connecting_target=false;
+ connecting_to=pos;
+
+ emit_signal("disconnection_request",E->get().from,E->get().from_port,E->get().to,E->get().to_port);
+ fr = get_node(String(connecting_from)); //maybe it was erased
+ if (fr && fr->cast_to<GraphNode>()) {
+ connecting=true;
+ }
+ return;
+ }
+
+ }
+ }
+ }
+
+
+ connecting=true;
+ connecting_from=gn->get_name();
+ connecting_index=j;
+ connecting_out=false;
+ connecting_type=gn->get_connection_input_type(j);
+ connecting_color=gn->get_connection_input_color(j);
+ connecting_target=false;
+ connecting_to=pos;
+ return;
+ }
+
+
+ }
+ }
+ }
+
+ if (p_ev.type==InputEvent::MOUSE_MOTION && connecting) {
+
+ connecting_to=Vector2(p_ev.mouse_motion.x,p_ev.mouse_motion.y);
+ connecting_target=false;
+ top_layer->update();
+
+ Ref<Texture> port =get_icon("port","GraphNode");
+ Vector2 mpos(p_ev.mouse_button.x,p_ev.mouse_button.y);
+ float grab_r=port->get_width()*0.5;
+ for(int i=get_child_count()-1;i>=0;i--) {
+
+ GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+ if (!gn)
+ continue;
+
+ if (!connecting_out) {
+ for(int j=0;j<gn->get_connection_output_count();j++) {
+
+ Vector2 pos = gn->get_connection_output_pos(j)+gn->get_pos();
+ int type =gn->get_connection_output_type(j);
+ if (type==connecting_type && pos.distance_to(mpos)<grab_r) {
+
+ connecting_target=true;
+ connecting_to=pos;
+ connecting_target_to=gn->get_name();
+ connecting_target_index=j;
+ return;
+ }
+
+
+ }
+ } else {
+
+ for(int j=0;j<gn->get_connection_input_count();j++) {
+
+ Vector2 pos = gn->get_connection_input_pos(j)+gn->get_pos();
+ int type =gn->get_connection_input_type(j);
+ if (type==connecting_type && pos.distance_to(mpos)<grab_r) {
+ connecting_target=true;
+ connecting_to=pos;
+ connecting_target_to=gn->get_name();
+ connecting_target_index=j;
+ return;
+ }
+ }
+ }
+ }
+ }
+
+ if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.button_index==BUTTON_LEFT && !p_ev.mouse_button.pressed) {
+
+ if (connecting && connecting_target) {
+
+ String from = connecting_from;
+ int from_slot = connecting_index;
+ String to =connecting_target_to;
+ int to_slot = connecting_target_index;
+
+ if (!connecting_out) {
+ SWAP(from,to);
+ SWAP(from_slot,to_slot);
+ }
+ emit_signal("connection_request",from,from_slot,to,to_slot);
+
+ }
+ connecting=false;
+ top_layer->update();
+
+ }
+
+
+
+}
+
+void GraphEdit::_draw_cos_line(const Vector2& p_from, const Vector2& p_to,const Color& p_color) {
+
+ static const int steps = 20;
+
+ Rect2 r;
+ r.pos=p_from;
+ r.expand_to(p_to);
+ Vector2 sign=Vector2((p_from.x < p_to.x) ? 1 : -1,(p_from.y < p_to.y) ? 1 : -1);
+ bool flip = sign.x * sign.y < 0;
+
+ Vector2 prev;
+ for(int i=0;i<=steps;i++) {
+
+ float d = i/float(steps);
+ float c=-Math::cos(d*Math_PI) * 0.5+0.5;
+ if (flip)
+ c=1.0-c;
+ Vector2 p = r.pos+Vector2(d*r.size.width,c*r.size.height);
+
+ if (i>0) {
+
+ top_layer->draw_line(prev,p,p_color,2);
+ }
+
+ prev=p;
+ }
+}
+
+void GraphEdit::_top_layer_draw() {
+
+ _update_scroll();
+
+ if (connecting) {
+
+ Node *fromn = get_node(connecting_from);
+ ERR_FAIL_COND(!fromn);
+ GraphNode *from = fromn->cast_to<GraphNode>();
+ ERR_FAIL_COND(!from);
+ Vector2 pos;
+ if (connecting_out)
+ pos=from->get_connection_output_pos(connecting_index);
+ else
+ pos=from->get_connection_input_pos(connecting_index);
+ pos+=from->get_pos();
+
+ Vector2 topos;
+ topos=connecting_to;
+
+ Color col=connecting_color;
+
+ if (connecting_target) {
+ col.r+=0.4;
+ col.g+=0.4;
+ col.b+=0.4;
+ }
+ _draw_cos_line(pos,topos,col);
+ }
+
+ List<List<Connection>::Element* > to_erase;
+ for(List<Connection>::Element *E=connections.front();E;E=E->next()) {
+
+ NodePath fromnp(E->get().from);
+
+ Node * from = get_node(fromnp);
+ if (!from) {
+ to_erase.push_back(E);
+ continue;
+ }
+
+ GraphNode *gfrom = from->cast_to<GraphNode>();
+
+ if (!gfrom) {
+ to_erase.push_back(E);
+ continue;
+ }
+
+ NodePath tonp(E->get().to);
+ Node * to = get_node(tonp);
+ if (!to) {
+ to_erase.push_back(E);
+ continue;
+ }
+
+ GraphNode *gto = to->cast_to<GraphNode>();
+
+ if (!gto) {
+ to_erase.push_back(E);
+ continue;
+ }
+
+ Vector2 frompos=gfrom->get_connection_output_pos(E->get().from_port)+gfrom->get_pos();
+ Color color = gfrom->get_connection_output_color(E->get().from_port);
+ Vector2 topos=gto->get_connection_input_pos(E->get().to_port)+gto->get_pos();
+ _draw_cos_line(frompos,topos,color);
+
+ }
+
+ while(to_erase.size()) {
+ connections.erase(to_erase.front()->get());
+ to_erase.pop_front();
+ }
+ //draw connections
+}
+
+void GraphEdit::_input_event(const InputEvent& p_ev) {
+
+ if (p_ev.type==InputEvent::MOUSE_MOTION && (p_ev.mouse_motion.button_mask&BUTTON_MASK_MIDDLE || (p_ev.mouse_motion.button_mask&BUTTON_MASK_LEFT && Input::get_singleton()->is_key_pressed(KEY_SPACE)))) {
+ h_scroll->set_val( h_scroll->get_val() - p_ev.mouse_motion.relative_x );
+ v_scroll->set_val( v_scroll->get_val() - p_ev.mouse_motion.relative_y );
+ }
+}
+
+void GraphEdit::clear_connections() {
+
+ connections.clear();
+ update();
+}
+
+
+void GraphEdit::set_right_disconnects(bool p_enable) {
+
+ right_disconnects=p_enable;
+}
+
+bool GraphEdit::is_right_disconnects_enabled() const{
+
+ return right_disconnects;
+}
+
+Array GraphEdit::_get_connection_list() const {
+
+ List<Connection> conns;
+ get_connection_list(&conns);
+ Array arr;
+ for(List<Connection>::Element *E=conns.front();E;E=E->next()) {
+ Dictionary d;
+ d["from"]=E->get().from;
+ d["from_port"]=E->get().from_port;
+ d["to"]=E->get().to;
+ d["to_port"]=E->get().to_port;
+ arr.push_back(d);
+ }
+ return arr;
+}
+void GraphEdit::_bind_methods() {
+
+ ObjectTypeDB::bind_method(_MD("connect_node:Error","from","from_port","to","to_port"),&GraphEdit::connect_node);
+ ObjectTypeDB::bind_method(_MD("is_node_connected","from","from_port","to","to_port"),&GraphEdit::is_node_connected);
+ ObjectTypeDB::bind_method(_MD("disconnect_node","from","from_port","to","to_port"),&GraphEdit::disconnect_node);
+ ObjectTypeDB::bind_method(_MD("get_connection_list"),&GraphEdit::_get_connection_list);
+
+ ObjectTypeDB::bind_method(_MD("set_right_disconnects","enable"),&GraphEdit::set_right_disconnects);
+ ObjectTypeDB::bind_method(_MD("is_right_disconnects_enabled"),&GraphEdit::is_right_disconnects_enabled);
+
+ ObjectTypeDB::bind_method(_MD("_graph_node_moved"),&GraphEdit::_graph_node_moved);
+ ObjectTypeDB::bind_method(_MD("_graph_node_raised"),&GraphEdit::_graph_node_raised);
+
+ ObjectTypeDB::bind_method(_MD("_top_layer_input"),&GraphEdit::_top_layer_input);
+ ObjectTypeDB::bind_method(_MD("_top_layer_draw"),&GraphEdit::_top_layer_draw);
+ ObjectTypeDB::bind_method(_MD("_scroll_moved"),&GraphEdit::_scroll_moved);
+
+ ObjectTypeDB::bind_method(_MD("_input_event"),&GraphEdit::_input_event);
+
+ ADD_SIGNAL(MethodInfo("connection_request",PropertyInfo(Variant::STRING,"from"),PropertyInfo(Variant::INT,"from_slot"),PropertyInfo(Variant::STRING,"to"),PropertyInfo(Variant::INT,"to_slot")));
+ ADD_SIGNAL(MethodInfo("disconnection_request",PropertyInfo(Variant::STRING,"from"),PropertyInfo(Variant::INT,"from_slot"),PropertyInfo(Variant::STRING,"to"),PropertyInfo(Variant::INT,"to_slot")));
+
+}
+
+
+
+GraphEdit::GraphEdit() {
+ top_layer=NULL;
+ top_layer=memnew(GraphEditFilter(this));
+ add_child(top_layer);
+ top_layer->set_stop_mouse(false);
+ top_layer->set_area_as_parent_rect();
+ top_layer->connect("draw",this,"_top_layer_draw");
+ top_layer->set_stop_mouse(false);
+ top_layer->connect("input_event",this,"_top_layer_input");
+
+ h_scroll = memnew(HScrollBar);
+ h_scroll->set_name("_h_scroll");
+ top_layer->add_child(h_scroll);
+
+ v_scroll = memnew(VScrollBar);
+ v_scroll->set_name("_v_scroll");
+ top_layer->add_child(v_scroll);
+ updating=false;
+ connecting=false;
+ right_disconnects=false;
+
+ h_scroll->connect("value_changed", this,"_scroll_moved");
+ v_scroll->connect("value_changed", this,"_scroll_moved");
+}
diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h
new file mode 100644
index 0000000000..0a9da73ab6
--- /dev/null
+++ b/scene/gui/graph_edit.h
@@ -0,0 +1,100 @@
+#ifndef GRAPH_EDIT_H
+#define GRAPH_EDIT_H
+
+#include "scene/gui/graph_node.h"
+#include "scene/gui/scroll_bar.h"
+
+class GraphEdit;
+
+class GraphEditFilter : public Control {
+
+ OBJ_TYPE(GraphEditFilter,Control);
+
+friend class GraphEdit;
+ GraphEdit *ge;
+ virtual bool has_point(const Point2& p_point) const;
+
+public:
+
+
+ GraphEditFilter(GraphEdit *p_edit);
+};
+
+class GraphEdit : public Control {
+
+ OBJ_TYPE(GraphEdit,Control);
+public:
+
+ struct Connection {
+ StringName from;
+ StringName to;
+ int from_port;
+ int to_port;
+
+ };
+private:
+
+ HScrollBar* h_scroll;
+ VScrollBar* v_scroll;
+
+
+ bool connecting;
+ String connecting_from;
+ bool connecting_out;
+ int connecting_index;
+ int connecting_type;
+ Color connecting_color;
+ bool connecting_target;
+ Vector2 connecting_to;
+ String connecting_target_to;
+ int connecting_target_index;
+
+
+
+ bool right_disconnects;
+ bool updating;
+ List<Connection> connections;
+
+ void _draw_cos_line(const Vector2& p_from, const Vector2& p_to,const Color& p_color);
+
+ void _graph_node_raised(Node* p_gn);
+ void _graph_node_moved(Node *p_gn);
+
+ void _update_scroll();
+ void _scroll_moved(double);
+ void _input_event(const InputEvent& p_ev);
+
+ GraphEditFilter *top_layer;
+ void _top_layer_input(const InputEvent& p_ev);
+ void _top_layer_draw();
+ void _update_scroll_offset();
+
+ Array _get_connection_list() const;
+
+friend class GraphEditFilter;
+ bool _filter_input(const Point2& p_point);
+protected:
+
+ static void _bind_methods();
+ virtual void add_child_notify(Node *p_child);
+ virtual void remove_child_notify(Node *p_child);
+ void _notification(int p_what);
+
+public:
+
+ Error connect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port);
+ bool is_node_connected(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port);
+ void disconnect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port);
+ void clear_connections();
+
+ GraphEditFilter *get_top_layer() const { return top_layer; }
+ void get_connection_list(List<Connection> *r_connections) const;
+
+ void set_right_disconnects(bool p_enable);
+ bool is_right_disconnects_enabled() const;
+
+
+ GraphEdit();
+};
+
+#endif // GRAPHEdit_H
diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp
new file mode 100644
index 0000000000..444b37855f
--- /dev/null
+++ b/scene/gui/graph_node.cpp
@@ -0,0 +1,583 @@
+#include "graph_node.h"
+#include "method_bind_ext.inc"
+
+
+bool GraphNode::_set(const StringName& p_name, const Variant& p_value) {
+
+ if (!p_name.operator String().begins_with("slot/"))
+ return false;
+
+ int idx=p_name.operator String().get_slice("/",1).to_int();
+ String what = p_name.operator String().get_slice("/",2);
+
+
+ Slot si;
+ if (slot_info.has(idx))
+ si=slot_info[idx];
+
+
+ if (what=="left_enabled")
+ si.enable_left=p_value;
+ else if (what=="left_type")
+ si.type_left=p_value;
+ else if (what=="left_color")
+ si.color_left=p_value;
+ else if (what=="right_enabled")
+ si.enable_right=p_value;
+ else if (what=="right_type")
+ si.type_right=p_value;
+ else if (what=="right_color")
+ si.color_right=p_value;
+ else
+ return false;
+
+ set_slot(idx,si.enable_left,si.type_left,si.color_left,si.enable_right,si.type_right,si.color_right);
+ update();
+ return true;
+}
+
+bool GraphNode::_get(const StringName& p_name,Variant &r_ret) const{
+
+
+
+ if (!p_name.operator String().begins_with("slot/")) {
+ return false;
+ }
+
+ int idx=p_name.operator String().get_slice("/",1).to_int();
+ String what = p_name.operator String().get_slice("/",2);
+
+
+
+ Slot si;
+ if (slot_info.has(idx))
+ si=slot_info[idx];
+
+ if (what=="left_enabled")
+ r_ret=si.enable_left;
+ else if (what=="left_type")
+ r_ret=si.type_left;
+ else if (what=="left_color")
+ r_ret=si.color_left;
+ else if (what=="right_enabled")
+ r_ret=si.enable_right;
+ else if (what=="right_type")
+ r_ret=si.type_right;
+ else if (what=="right_color")
+ r_ret=si.color_right;
+ else
+ return false;
+
+ return true;
+}
+void GraphNode::_get_property_list( List<PropertyInfo> *p_list) const{
+
+ int idx=0;
+ for(int i=0;i<get_child_count();i++) {
+ Control *c=get_child(i)->cast_to<Control>();
+ if (!c || c->is_set_as_toplevel() )
+ continue;
+
+ String base="slot/"+itos(idx)+"/";
+
+ p_list->push_back(PropertyInfo(Variant::BOOL,base+"left_enabled"));
+ p_list->push_back(PropertyInfo(Variant::INT,base+"left_type"));
+ p_list->push_back(PropertyInfo(Variant::COLOR,base+"left_color"));
+ p_list->push_back(PropertyInfo(Variant::BOOL,base+"right_enabled"));
+ p_list->push_back(PropertyInfo(Variant::INT,base+"right_type"));
+ p_list->push_back(PropertyInfo(Variant::COLOR,base+"right_color"));
+
+ idx++;
+ }
+}
+
+
+void GraphNode::_resort() {
+
+
+
+ int sep=get_constant("separation");
+ Ref<StyleBox> sb=get_stylebox("frame");
+ bool first=true;
+
+ Size2 minsize;
+
+ for(int i=0;i<get_child_count();i++) {
+ Control *c=get_child(i)->cast_to<Control>();
+ if (!c)
+ continue;
+ if (c->is_set_as_toplevel())
+ continue;
+
+ Size2i size=c->get_combined_minimum_size();
+
+ minsize.y+=size.y;
+ minsize.x=MAX(minsize.x,size.x);
+
+ if (first)
+ first=false;
+ else
+ minsize.y+=sep;
+
+ }
+
+
+ int vofs=0;
+ int w = get_size().x - sb->get_minimum_size().x;
+
+
+ cache_y.clear();
+ for(int i=0;i<get_child_count();i++) {
+ Control *c=get_child(i)->cast_to<Control>();
+ if (!c)
+ continue;
+ if (c->is_set_as_toplevel())
+ continue;
+
+ Size2i size=c->get_combined_minimum_size();
+
+ Rect2 r(sb->get_margin(MARGIN_LEFT),sb->get_margin(MARGIN_TOP)+vofs,w,size.y);
+
+ fit_child_in_rect(c,r);
+ cache_y.push_back(vofs+size.y*0.5);
+
+ if (vofs>0)
+ vofs+=sep;
+ vofs+=size.y;
+
+
+ }
+
+ _change_notify();
+ update();
+ connpos_dirty=true;
+
+
+}
+
+
+void GraphNode::_notification(int p_what) {
+
+ if (p_what==NOTIFICATION_DRAW) {
+
+ Ref<StyleBox> sb=get_stylebox("frame");
+ Ref<Texture> port =get_icon("port");
+ Ref<Texture> close =get_icon("close");
+ int close_offset = get_constant("close_offset");
+ Ref<Font> title_font = get_font("title_font");
+ int title_offset = get_constant("title_offset");
+ Color title_color = get_color("title_color");
+ Point2i icofs = -port->get_size()*0.5;
+ int edgeofs=get_constant("port_offset");
+ icofs.y+=sb->get_margin(MARGIN_TOP);
+ draw_style_box(sb,Rect2(Point2(),get_size()));
+
+ int w = get_size().width-sb->get_minimum_size().x;
+
+ if (show_close)
+ w-=close->get_width();
+
+ draw_string(title_font,Point2(sb->get_margin(MARGIN_LEFT),-title_font->get_height()+title_font->get_ascent()+title_offset),title,title_color,w);
+ if (show_close) {
+ Vector2 cpos = Point2(w+sb->get_margin(MARGIN_LEFT),-close->get_height()+close_offset);
+ draw_texture(close,cpos);
+ close_rect.pos=cpos;
+ close_rect.size=close->get_size();
+ } else {
+ close_rect=Rect2();
+ }
+
+ for (Map<int,Slot>::Element *E=slot_info.front();E;E=E->next()) {
+
+ if (E->key() < 0 || E->key()>=cache_y.size())
+ continue;
+ if (!slot_info.has(E->key()))
+ continue;
+ const Slot &s=slot_info[E->key()];
+ //left
+ if (s.enable_left)
+ port->draw(get_canvas_item(),icofs+Point2(edgeofs,cache_y[E->key()]),s.color_left);
+ if (s.enable_right)
+ port->draw(get_canvas_item(),icofs+Point2(get_size().x-edgeofs,cache_y[E->key()]),s.color_right);
+
+ }
+ }
+
+ if (p_what==NOTIFICATION_SORT_CHILDREN) {
+
+ _resort();
+ }
+
+}
+
+
+void GraphNode::set_slot(int p_idx,bool p_enable_left,int p_type_left,const Color& p_color_left, bool p_enable_right,int p_type_right,const Color& p_color_right) {
+
+ ERR_FAIL_COND(p_idx<0);
+
+ if (!p_enable_left && p_type_left==0 && p_color_left==Color(1,1,1,1) && !p_enable_right && p_type_right==0 && p_color_right==Color(1,1,1,1)) {
+ slot_info.erase(p_idx);
+ return;
+ }
+
+ Slot s;
+ s.enable_left=p_enable_left;
+ s.type_left=p_type_left;
+ s.color_left=p_color_left;
+ s.enable_right=p_enable_right;
+ s.type_right=p_type_right;
+ s.color_right=p_color_right;
+ slot_info[p_idx]=s;
+ update();
+ connpos_dirty=true;
+
+}
+
+void GraphNode::clear_slot(int p_idx){
+
+ slot_info.erase(p_idx);
+ update();
+ connpos_dirty=true;
+
+}
+void GraphNode::clear_all_slots(){
+
+ slot_info.clear();
+ update();
+ connpos_dirty=true;
+
+}
+bool GraphNode::is_slot_enabled_left(int p_idx) const{
+
+ if (!slot_info.has(p_idx))
+ return false;
+ return slot_info[p_idx].enable_left;
+
+}
+
+int GraphNode::get_slot_type_left(int p_idx) const{
+
+ if (!slot_info.has(p_idx))
+ return 0;
+ return slot_info[p_idx].type_left;
+
+}
+
+Color GraphNode::get_slot_color_left(int p_idx) const{
+
+ if (!slot_info.has(p_idx))
+ return Color(1,1,1,1);
+ return slot_info[p_idx].color_left;
+
+}
+
+bool GraphNode::is_slot_enabled_right(int p_idx) const{
+
+ if (!slot_info.has(p_idx))
+ return false;
+ return slot_info[p_idx].enable_right;
+
+}
+
+
+
+int GraphNode::get_slot_type_right(int p_idx) const{
+
+ if (!slot_info.has(p_idx))
+ return 0;
+ return slot_info[p_idx].type_right;
+
+}
+
+Color GraphNode::get_slot_color_right(int p_idx) const{
+
+ if (!slot_info.has(p_idx))
+ return Color(1,1,1,1);
+ return slot_info[p_idx].color_right;
+
+}
+
+Size2 GraphNode::get_minimum_size() const {
+
+ Ref<Font> title_font = get_font("title_font");
+
+ int sep=get_constant("separation");
+ Ref<StyleBox> sb=get_stylebox("frame");
+ bool first=true;
+
+ Size2 minsize;
+ minsize.x=title_font->get_string_size(title).x;
+ if (show_close) {
+ Ref<Texture> close =get_icon("close");
+ minsize.x+=sep+close->get_width();
+ }
+
+
+ for(int i=0;i<get_child_count();i++) {
+
+ Control *c=get_child(i)->cast_to<Control>();
+ if (!c)
+ continue;
+ if (c->is_set_as_toplevel())
+ continue;
+
+ Size2i size=c->get_combined_minimum_size();
+
+ minsize.y+=size.y;
+ minsize.x=MAX(minsize.x,size.x);
+
+ if (first)
+ first=false;
+ else
+ minsize.y+=sep;
+ }
+
+ return minsize+sb->get_minimum_size();
+}
+
+void GraphNode::set_title(const String& p_title) {
+
+ title=p_title;
+ minimum_size_changed();
+ update();
+
+}
+
+String GraphNode::get_title() const{
+
+ return title;
+}
+
+void GraphNode::set_offset(const Vector2& p_offset) {
+
+ offset=p_offset;
+ emit_signal("offset_changed");
+ update();
+}
+
+Vector2 GraphNode::get_offset() const {
+
+ return offset;
+}
+
+
+
+void GraphNode::set_show_close_button(bool p_enable){
+
+ show_close=p_enable;
+ update();
+}
+bool GraphNode::is_close_button_visible() const{
+
+ return show_close;
+}
+
+void GraphNode::_connpos_update() {
+
+
+ int edgeofs=get_constant("port_offset");
+ int sep=get_constant("separation");
+
+ Ref<StyleBox> sb=get_stylebox("frame");
+ Ref<Texture> port =get_icon("port");
+ conn_input_cache.clear();
+ conn_output_cache.clear();
+ int vofs=0;
+
+ int idx=0;
+
+ for(int i=0;i<get_child_count();i++) {
+ Control *c=get_child(i)->cast_to<Control>();
+ if (!c)
+ continue;
+ if (c->is_set_as_toplevel())
+ continue;
+
+ Size2i size=c->get_combined_minimum_size();
+
+ int y = sb->get_margin(MARGIN_TOP)+vofs;
+ int h = size.y;
+
+
+ if (slot_info.has(idx)) {
+
+ if (slot_info[idx].enable_left) {
+ ConnCache cc;
+ cc.pos=Point2i(edgeofs,y+h/2);
+ cc.type=slot_info[idx].type_left;
+ cc.color=slot_info[idx].color_left;
+ conn_input_cache.push_back(cc);
+ }
+ if (slot_info[idx].enable_right) {
+ ConnCache cc;
+ cc.pos=Point2i(get_size().width-edgeofs,y+h/2);
+ cc.type=slot_info[idx].type_right;
+ cc.color=slot_info[idx].color_right;
+ conn_output_cache.push_back(cc);
+ }
+ }
+
+ if (vofs>0)
+ vofs+=sep;
+ vofs+=size.y;
+ idx++;
+
+ }
+
+
+ connpos_dirty=false;
+}
+
+int GraphNode::get_connection_input_count() {
+
+ if (connpos_dirty)
+ _connpos_update();
+
+ return conn_input_cache.size();
+
+}
+int GraphNode::get_connection_output_count() {
+
+ if (connpos_dirty)
+ _connpos_update();
+
+ return conn_output_cache.size();
+
+}
+
+
+Vector2 GraphNode::get_connection_input_pos(int p_idx) {
+
+ if (connpos_dirty)
+ _connpos_update();
+
+ ERR_FAIL_INDEX_V(p_idx,conn_input_cache.size(),Vector2());
+ return conn_input_cache[p_idx].pos;
+}
+
+int GraphNode::get_connection_input_type(int p_idx) {
+
+ if (connpos_dirty)
+ _connpos_update();
+
+ ERR_FAIL_INDEX_V(p_idx,conn_input_cache.size(),0);
+ return conn_input_cache[p_idx].type;
+}
+
+Color GraphNode::get_connection_input_color(int p_idx) {
+
+ if (connpos_dirty)
+ _connpos_update();
+
+ ERR_FAIL_INDEX_V(p_idx,conn_input_cache.size(),Color());
+ return conn_input_cache[p_idx].color;
+}
+
+Vector2 GraphNode::get_connection_output_pos(int p_idx){
+
+ if (connpos_dirty)
+ _connpos_update();
+
+ ERR_FAIL_INDEX_V(p_idx,conn_output_cache.size(),Vector2());
+ return conn_output_cache[p_idx].pos;
+
+}
+
+int GraphNode::get_connection_output_type(int p_idx) {
+
+ if (connpos_dirty)
+ _connpos_update();
+
+ ERR_FAIL_INDEX_V(p_idx,conn_output_cache.size(),0);
+ return conn_output_cache[p_idx].type;
+}
+
+Color GraphNode::get_connection_output_color(int p_idx) {
+
+ if (connpos_dirty)
+ _connpos_update();
+
+ ERR_FAIL_INDEX_V(p_idx,conn_output_cache.size(),Color());
+ return conn_output_cache[p_idx].color;
+}
+
+void GraphNode::_input_event(const InputEvent& p_ev) {
+
+ if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.pressed && p_ev.mouse_button.button_index==BUTTON_LEFT) {
+
+ Vector2 mpos = Vector2(p_ev.mouse_button.x,p_ev.mouse_button.y);
+ if (close_rect.size!=Size2() && close_rect.has_point(mpos)) {
+ emit_signal("close_request");
+ return;
+ }
+
+ drag_from=get_offset();
+ drag_accum=Vector2();
+ dragging=true;
+ emit_signal("raise_request");
+
+ }
+
+ if (p_ev.type==InputEvent::MOUSE_BUTTON && !p_ev.mouse_button.pressed && p_ev.mouse_button.button_index==BUTTON_LEFT) {
+
+ dragging=false;
+ emit_signal("dragged",drag_from,get_offset()); //useful for undo/redo
+ }
+
+ if (p_ev.type==InputEvent::MOUSE_MOTION && dragging) {
+
+ drag_accum+=Vector2(p_ev.mouse_motion.relative_x,p_ev.mouse_motion.relative_y);
+ set_offset(drag_from+drag_accum);
+ }
+
+}
+
+
+void GraphNode::_bind_methods() {
+
+ ObjectTypeDB::bind_method(_MD("set_title","title"),&GraphNode::set_title);
+ ObjectTypeDB::bind_method(_MD("get_title"),&GraphNode::get_title);
+ ObjectTypeDB::bind_method(_MD("_input_event"),&GraphNode::_input_event);
+
+ ObjectTypeDB::bind_method(_MD("set_slot","idx","enable_left","type_left","color_left","enable_right","type_right","color_right"),&GraphNode::set_slot);
+ ObjectTypeDB::bind_method(_MD("clear_slot","idx"),&GraphNode::clear_slot);
+ ObjectTypeDB::bind_method(_MD("clear_all_slots","idx"),&GraphNode::clear_all_slots);
+ ObjectTypeDB::bind_method(_MD("is_slot_enabled_left","idx"),&GraphNode::is_slot_enabled_left);
+ ObjectTypeDB::bind_method(_MD("get_slot_type_left","idx"),&GraphNode::get_slot_type_left);
+ ObjectTypeDB::bind_method(_MD("get_slot_color_left","idx"),&GraphNode::get_slot_color_left);
+ ObjectTypeDB::bind_method(_MD("is_slot_enabled_right","idx"),&GraphNode::is_slot_enabled_right);
+ ObjectTypeDB::bind_method(_MD("get_slot_type_right","idx"),&GraphNode::get_slot_type_right);
+ ObjectTypeDB::bind_method(_MD("get_slot_color_right","idx"),&GraphNode::get_slot_color_right);
+
+ ObjectTypeDB::bind_method(_MD("set_offset","offset"),&GraphNode::set_offset);
+ ObjectTypeDB::bind_method(_MD("get_offset"),&GraphNode::get_offset);
+
+ ObjectTypeDB::bind_method(_MD("get_connection_output_count"),&GraphNode::get_connection_output_count);
+ ObjectTypeDB::bind_method(_MD("get_connection_input_count"),&GraphNode::get_connection_input_count);
+
+ ObjectTypeDB::bind_method(_MD("get_connection_output_pos","idx"),&GraphNode::get_connection_output_pos);
+ ObjectTypeDB::bind_method(_MD("get_connection_output_type","idx"),&GraphNode::get_connection_output_type);
+ ObjectTypeDB::bind_method(_MD("get_connection_output_color","idx"),&GraphNode::get_connection_output_color);
+ ObjectTypeDB::bind_method(_MD("get_connection_input_pos","idx"),&GraphNode::get_connection_input_pos);
+ ObjectTypeDB::bind_method(_MD("get_connection_input_type","idx"),&GraphNode::get_connection_input_type);
+ ObjectTypeDB::bind_method(_MD("get_connection_input_color","idx"),&GraphNode::get_connection_input_color);
+
+
+ ObjectTypeDB::bind_method(_MD("set_show_close_button","show"),&GraphNode::set_show_close_button);
+ ObjectTypeDB::bind_method(_MD("is_close_button_visible"),&GraphNode::is_close_button_visible);
+
+ ADD_PROPERTY( PropertyInfo(Variant::STRING,"title"),_SCS("set_title"),_SCS("get_title"));
+ ADD_PROPERTY( PropertyInfo(Variant::BOOL,"show_close"),_SCS("set_show_close_button"),_SCS("is_close_button_visible"));
+
+ ADD_SIGNAL(MethodInfo("offset_changed"));
+ ADD_SIGNAL(MethodInfo("dragged",PropertyInfo(Variant::VECTOR2,"from"),PropertyInfo(Variant::VECTOR2,"to")));
+ ADD_SIGNAL(MethodInfo("raise_request"));
+ ADD_SIGNAL(MethodInfo("close_request"));
+}
+
+GraphNode::GraphNode() {
+
+ dragging=false;
+ show_close=false;
+ connpos_dirty=true;
+}
diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h
new file mode 100644
index 0000000000..0d5cbf8dd3
--- /dev/null
+++ b/scene/gui/graph_node.h
@@ -0,0 +1,101 @@
+#ifndef GRAPH_NODE_H
+#define GRAPH_NODE_H
+
+#include "scene/gui/container.h"
+
+class GraphNode : public Container {
+
+ OBJ_TYPE(GraphNode,Container);
+
+
+
+ struct Slot {
+ bool enable_left;
+ int type_left;
+ Color color_left;
+ bool enable_right;
+ int type_right;
+ Color color_right;
+
+
+ Slot() { enable_left=false; type_left=0; color_left=Color(1,1,1,1); enable_right=false; type_right=0; color_right=Color(1,1,1,1); };
+ };
+
+ String title;
+ bool show_close;
+ Vector2 offset;
+
+ Rect2 close_rect;
+
+ Vector<int> cache_y;
+
+ struct ConnCache {
+ Vector2 pos;
+ int type;
+ Color color;
+ };
+
+ Vector<ConnCache> conn_input_cache;
+ Vector<ConnCache> conn_output_cache;
+
+ Map<int,Slot> slot_info;
+
+ bool connpos_dirty;
+
+ void _connpos_update();
+ void _resort();
+
+ Vector2 drag_from;
+ Vector2 drag_accum;
+ bool dragging;
+protected:
+
+ void _input_event(const InputEvent& p_ev);
+ void _notification(int p_what);
+ static void _bind_methods();
+
+ bool _set(const StringName& p_name, const Variant& p_value);
+ bool _get(const StringName& p_name,Variant &r_ret) const;
+ void _get_property_list( List<PropertyInfo> *p_list) const;
+
+public:
+
+
+
+
+ void set_slot(int p_idx,bool p_enable_left,int p_type_left,const Color& p_color_left, bool p_enable_right,int p_type_right,const Color& p_color_right);
+ void clear_slot(int p_idx);
+ void clear_all_slots();
+ bool is_slot_enabled_left(int p_idx) const;
+ int get_slot_type_left(int p_idx) const;
+ Color get_slot_color_left(int p_idx) const;
+ bool is_slot_enabled_right(int p_idx) const;
+ int get_slot_type_right(int p_idx) const;
+ Color get_slot_color_right(int p_idx) const;
+
+ void set_title(const String& p_title);
+ String get_title() const;
+
+ void set_offset(const Vector2& p_offset);
+ Vector2 get_offset() const;
+
+ void set_show_close_button(bool p_enable);
+ bool is_close_button_visible() const;
+
+ int get_connection_input_count() ;
+ int get_connection_output_count() ;
+ Vector2 get_connection_input_pos(int p_idx);
+ int get_connection_input_type(int p_idx);
+ Color get_connection_input_color(int p_idx);
+ Vector2 get_connection_output_pos(int p_idx);
+ int get_connection_output_type(int p_idx);
+ Color get_connection_output_color(int p_idx);
+
+
+ virtual Size2 get_minimum_size() const;
+
+ GraphNode();
+};
+
+
+#endif // GRAPH_NODE_H
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
index 7353744d07..d10ca20fc3 100644
--- a/scene/gui/menu_button.cpp
+++ b/scene/gui/menu_button.cpp
@@ -84,6 +84,7 @@ void MenuButton::pressed() {
popup->set_parent_rect( Rect2(Point2(gp-popup->get_global_pos()),get_size()));
popup->popup();
popup->call_deferred("grab_click_focus");
+ popup->set_invalidate_click_until_motion();
}
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
index 65ad02723c..bccd05d4fe 100644
--- a/scene/gui/popup.cpp
+++ b/scene/gui/popup.cpp
@@ -51,11 +51,18 @@ void Popup::_fix_size() {
Control *window = get_window();
ERR_FAIL_COND(!window);
-
+
+#if 0
Point2 pos = get_pos();
Size2 size = get_size();
Point2 window_size = window==this ? get_parent_area_size() :window->get_size();
+#else
+
+ Point2 pos = get_global_pos();
+ Size2 size = get_size();
+ Point2 window_size = get_viewport_rect().size;
+#endif
if (pos.x+size.width > window_size.width)
pos.x=window_size.width-size.width;
if (pos.x<0)
@@ -65,8 +72,14 @@ void Popup::_fix_size() {
pos.y=window_size.height-size.height;
if (pos.y<0)
pos.y=0;
+#if 0
if (pos!=get_pos())
set_pos(pos);
+#else
+ if (pos!=get_pos())
+ set_global_pos(pos);
+
+#endif
}
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index 0ba3bdb7c6..1fd1d8adc8 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -30,6 +30,7 @@
#include "print_string.h"
#include "os/keyboard.h"
#include "translation.h"
+#include "os/input.h"
String PopupMenu::_get_accel_text(uint32_t p_accel) const {
@@ -318,6 +319,10 @@ void PopupMenu::_input_event(const InputEvent &p_event) {
int over=_get_mouse_over(Point2(b.x,b.y));
+ if (invalidated_click) {
+ invalidated_click=false;
+ break;
+ }
if (over<0 || items[over].separator || items[over].disabled)
break; //non-activable
@@ -336,6 +341,13 @@ void PopupMenu::_input_event(const InputEvent &p_event) {
case InputEvent::MOUSE_MOTION: {
+ if (invalidated_click) {
+ moved+=Vector2(p_event.mouse_motion.relative_x,p_event.mouse_motion.relative_y);
+ if (moved.length()>4)
+ invalidated_click=false;
+
+ }
+
const InputEventMouseMotion &m=p_event.mouse_motion;
for(List<Rect2>::Element *E=autohide_areas.front();E;E=E->next()) {
@@ -893,12 +905,17 @@ void PopupMenu::_bind_methods() {
}
+
+void PopupMenu::set_invalidate_click_until_motion() {
+ moved=Vector2();
+ invalidated_click=true;
+}
+
PopupMenu::PopupMenu() {
idcount=0;
mouse_over=-1;
-
set_focus_mode(FOCUS_ALL);
set_as_toplevel(true);
diff --git a/scene/gui/popup_menu.h b/scene/gui/popup_menu.h
index b150be1008..c2e988de95 100644
--- a/scene/gui/popup_menu.h
+++ b/scene/gui/popup_menu.h
@@ -70,6 +70,8 @@ class PopupMenu : public Popup {
void _activate_submenu(int over);
void _submenu_timeout();
+ bool invalidated_click;
+ Vector2 moved;
Array _get_items() const;
void _set_items(const Array& p_items);
@@ -134,6 +136,8 @@ public:
void add_autohide_area(const Rect2& p_area);
void clear_autohide_areas();
+ void set_invalidate_click_until_motion();
+
PopupMenu();
~PopupMenu();
diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp
index 2d6f3cd27a..12a8a83f26 100644
--- a/scene/gui/tab_container.cpp
+++ b/scene/gui/tab_container.cpp
@@ -602,6 +602,39 @@ void TabContainer::get_translatable_strings(List<String> *p_strings) const {
}
+Size2 TabContainer::get_minimum_size() const {
+
+ Size2 ms;
+
+ for(int i=0;i<get_child_count();i++) {
+
+ Control *c = get_child(i)->cast_to<Control>();
+ if (!c)
+ continue;
+ if (c->is_set_as_toplevel())
+ continue;
+
+ if (!c->has_meta("_tab_name"))
+ continue;
+
+ if (!c->is_visible())
+ continue;
+
+ Size2 cms = c->get_minimum_size();
+ ms.x=MAX(ms.x,cms.x);
+ ms.y=MAX(ms.y,cms.y);
+ }
+
+ Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
+ Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
+ Ref<Font> font = get_font("font");
+
+ ms.y+=MAX(tab_bg->get_minimum_size().y,tab_fg->get_minimum_size().y);
+ ms.y+=font->get_height();
+
+ return ms;
+}
+
void TabContainer::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_input_event"),&TabContainer::_input_event);
diff --git a/scene/gui/tab_container.h b/scene/gui/tab_container.h
index d5b6a2b503..df7b03e040 100644
--- a/scene/gui/tab_container.h
+++ b/scene/gui/tab_container.h
@@ -85,6 +85,8 @@ public:
void set_current_tab(int p_current);
int get_current_tab() const;
+ virtual Size2 get_minimum_size() const;
+
virtual void get_translatable_strings(List<String> *p_strings) const;
TabContainer();
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index ba68948e6b..d589b93049 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -26,7 +26,7 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
- /*****f********************************************/
+/*****f********************************************/
/* text_edit.cpp */
/*************************************************/
/* This file is part of: */
@@ -47,2160 +47,2409 @@
#define TAB_PIXELS
static bool _is_text_char(CharType c) {
-
- return (c>='a' && c<='z') || (c>='A' && c<='Z') || (c>='0' && c<='9') || c=='_';
+
+ return (c>='a' && c<='z') || (c>='A' && c<='Z') || (c>='0' && c<='9') || c=='_';
}
static bool _is_symbol(CharType c) {
-
- return c!='_' && ((c>='!' && c<='/') || (c>=':' && c<='@') || (c>='[' && c<='`') || (c>='{' && c<='~') || c=='\t');
+
+ return c!='_' && ((c>='!' && c<='/') || (c>=':' && c<='@') || (c>='[' && c<='`') || (c>='{' && c<='~') || c=='\t');
}
static bool _is_pair_right_symbol(CharType c) {
- return
- c == '"' ||
- c == '\'' ||
- c == ')' ||
- c == ']' ||
- c == '}';
+ return
+ c == '"' ||
+ c == '\'' ||
+ c == ')' ||
+ c == ']' ||
+ c == '}';
}
static bool _is_pair_left_symbol(CharType c) {
- return
- c == '"' ||
- c == '\'' ||
- c == '(' ||
- c == '[' ||
- c == '{';
+ return
+ c == '"' ||
+ c == '\'' ||
+ c == '(' ||
+ c == '[' ||
+ c == '{';
}
static bool _is_pair_symbol(CharType c) {
- return _is_pair_left_symbol(c) || _is_pair_right_symbol(c);
+ return _is_pair_left_symbol(c) || _is_pair_right_symbol(c);
}
static CharType _get_right_pair_symbol(CharType c) {
- if(c == '"')
- return '"';
- if(c == '\'')
- return '\'';
- if(c == '(')
- return ')';
- if(c == '[')
- return ']';
- if(c == '{')
- return '}';
- return 0;
+ if(c == '"')
+ return '"';
+ if(c == '\'')
+ return '\'';
+ if(c == '(')
+ return ')';
+ if(c == '[')
+ return ']';
+ if(c == '{')
+ return '}';
+ return 0;
}
void TextEdit::Text::set_font(const Ref<Font>& p_font) {
-
- font=p_font;
+
+ font=p_font;
}
void TextEdit::Text::set_tab_size(int p_tab_size) {
-
- tab_size=p_tab_size;
+
+ tab_size=p_tab_size;
}
void TextEdit::Text::_update_line_cache(int p_line) const {
-
- int w =0;
- int tab_w=font->get_char_size(' ').width;
-
- int len = text[p_line].data.length();
- const CharType *str = text[p_line].data.c_str();
-
- //update width
-
- for(int i=0;i<len;i++) {
- if (str[i]=='\t') {
-
- int left = w%tab_w;
- if (left==0)
- w+=tab_w;
- else
- w+=tab_w-w%tab_w; // is right...
-
- } else {
-
- w+=font->get_char_size(str[i],str[i+1]).width;
- }
- }
-
-
- text[p_line].width_cache=w;
-
- //update regions
-
- text[p_line].region_info.clear();
-
- for(int i=0;i<len;i++) {
-
- if (!_is_symbol(str[i]))
- continue;
- if (str[i]=='\\') {
- i++; //skip quoted anything
- continue;
- }
-
- int left=len-i;
-
- for(int j=0;j<color_regions->size();j++) {
-
- const ColorRegion& cr=color_regions->operator [](j);
-
- /* BEGIN */
-
- int lr=cr.begin_key.length();
- if (lr==0 || lr>left)
- continue;
-
- const CharType* kc = cr.begin_key.c_str();
-
- bool match=true;
-
- for(int k=0;k<lr;k++) {
- if (kc[k]!=str[i+k]) {
- match=false;
- break;
- }
- }
-
- if (match) {
-
- ColorRegionInfo cri;
- cri.end=false;
- cri.region=j;
- text[p_line].region_info[i]=cri;
- i+=lr-1;
- break;
- }
-
- /* END */
-
- lr=cr.end_key.length();
- if (lr==0 || lr>left)
- continue;
-
- kc = cr.end_key.c_str();
-
- match=true;
-
- for(int k=0;k<lr;k++) {
- if (kc[k]!=str[i+k]) {
- match=false;
- break;
- }
- }
-
- if (match) {
-
- ColorRegionInfo cri;
- cri.end=true;
- cri.region=j;
- text[p_line].region_info[i]=cri;
- i+=lr-1;
- break;
- }
-
- }
- }
-
-
+
+ int w =0;
+ int tab_w=font->get_char_size(' ').width;
+
+ int len = text[p_line].data.length();
+ const CharType *str = text[p_line].data.c_str();
+
+ //update width
+
+ for(int i=0;i<len;i++) {
+ if (str[i]=='\t') {
+
+ int left = w%tab_w;
+ if (left==0)
+ w+=tab_w;
+ else
+ w+=tab_w-w%tab_w; // is right...
+
+ } else {
+
+ w+=font->get_char_size(str[i],str[i+1]).width;
+ }
+ }
+
+
+ text[p_line].width_cache=w;
+
+ //update regions
+
+ text[p_line].region_info.clear();
+
+ for(int i=0;i<len;i++) {
+
+ if (!_is_symbol(str[i]))
+ continue;
+ if (str[i]=='\\') {
+ i++; //skip quoted anything
+ continue;
+ }
+
+ int left=len-i;
+
+ for(int j=0;j<color_regions->size();j++) {
+
+ const ColorRegion& cr=color_regions->operator [](j);
+
+ /* BEGIN */
+
+ int lr=cr.begin_key.length();
+ if (lr==0 || lr>left)
+ continue;
+
+ const CharType* kc = cr.begin_key.c_str();
+
+ bool match=true;
+
+ for(int k=0;k<lr;k++) {
+ if (kc[k]!=str[i+k]) {
+ match=false;
+ break;
+ }
+ }
+
+ if (match) {
+
+ ColorRegionInfo cri;
+ cri.end=false;
+ cri.region=j;
+ text[p_line].region_info[i]=cri;
+ i+=lr-1;
+ break;
+ }
+
+ /* END */
+
+ lr=cr.end_key.length();
+ if (lr==0 || lr>left)
+ continue;
+
+ kc = cr.end_key.c_str();
+
+ match=true;
+
+ for(int k=0;k<lr;k++) {
+ if (kc[k]!=str[i+k]) {
+ match=false;
+ break;
+ }
+ }
+
+ if (match) {
+
+ ColorRegionInfo cri;
+ cri.end=true;
+ cri.region=j;
+ text[p_line].region_info[i]=cri;
+ i+=lr-1;
+ break;
+ }
+
+ }
+ }
+
+
}
const Map<int,TextEdit::Text::ColorRegionInfo>& TextEdit::Text::get_color_region_info(int p_line) {
-
- Map<int,ColorRegionInfo> *cri=NULL;
- ERR_FAIL_INDEX_V(p_line,text.size(),*cri); //enjoy your crash
-
- if (text[p_line].width_cache==-1) {
- _update_line_cache(p_line);
- }
-
- return text[p_line].region_info;
+
+ Map<int,ColorRegionInfo> *cri=NULL;
+ ERR_FAIL_INDEX_V(p_line,text.size(),*cri); //enjoy your crash
+
+ if (text[p_line].width_cache==-1) {
+ _update_line_cache(p_line);
+ }
+
+ return text[p_line].region_info;
}
int TextEdit::Text::get_line_width(int p_line) const {
-
- ERR_FAIL_INDEX_V(p_line,text.size(),-1);
-
- if (text[p_line].width_cache==-1) {
- _update_line_cache(p_line);
- }
-
- return text[p_line].width_cache;
+
+ ERR_FAIL_INDEX_V(p_line,text.size(),-1);
+
+ if (text[p_line].width_cache==-1) {
+ _update_line_cache(p_line);
+ }
+
+ return text[p_line].width_cache;
}
void TextEdit::Text::clear_caches() {
-
- for(int i=0;i<text.size();i++)
- text[i].width_cache=-1;
-
+
+ for(int i=0;i<text.size();i++)
+ text[i].width_cache=-1;
+
}
void TextEdit::Text::clear() {
-
-
- text.clear();;
- insert(0,"");
+
+
+ text.clear();;
+ insert(0,"");
}
int TextEdit::Text::get_max_width() const {
- //quite some work.. but should be fast enough.
-
- int max = 0;
-
- for(int i=0;i<text.size();i++)
- max=MAX(max,get_line_width(i));
- return max;
-
+ //quite some work.. but should be fast enough.
+
+ int max = 0;
+
+ for(int i=0;i<text.size();i++)
+ max=MAX(max,get_line_width(i));
+ return max;
+
}
void TextEdit::Text::set(int p_line,const String& p_text) {
-
- ERR_FAIL_INDEX(p_line,text.size());
-
- text[p_line].width_cache=-1;
- text[p_line].data=p_text;
+
+ ERR_FAIL_INDEX(p_line,text.size());
+
+ text[p_line].width_cache=-1;
+ text[p_line].data=p_text;
}
void TextEdit::Text::insert(int p_at,const String& p_text) {
-
- Line line;
- line.marked=false;
- line.breakpoint=false;
- line.width_cache=-1;
- line.data=p_text;
- text.insert(p_at,line);
+
+ Line line;
+ line.marked=false;
+ line.breakpoint=false;
+ line.width_cache=-1;
+ line.data=p_text;
+ text.insert(p_at,line);
}
void TextEdit::Text::remove(int p_at) {
-
- text.remove(p_at);
+
+ text.remove(p_at);
}
void TextEdit::_update_scrollbars() {
-
-
- Size2 size = get_size();
- Size2 hmin = h_scroll->get_combined_minimum_size();
- Size2 vmin = v_scroll->get_combined_minimum_size();
-
-
-
- v_scroll->set_begin( Point2(size.width - vmin.width, cache.style_normal->get_margin(MARGIN_TOP)) );
- v_scroll->set_end( Point2(size.width, size.height - cache.style_normal->get_margin(MARGIN_TOP) - cache.style_normal->get_margin(MARGIN_BOTTOM)) );
-
- h_scroll->set_begin( Point2( 0, size.height - hmin.height) );
- h_scroll->set_end( Point2(size.width-vmin.width, size.height) );
-
-
- int hscroll_rows = ((hmin.height-1)/get_row_height())+1;
- int visible_rows = get_visible_rows();
- int total_rows = text.size() * cache.line_spacing;
-
- int vscroll_pixels = v_scroll->get_combined_minimum_size().width;
- int visible_width = size.width - cache.style_normal->get_minimum_size().width;
- int total_width = text.get_max_width();
-
- bool use_hscroll=true;
- bool use_vscroll=true;
-
- if (total_rows <= visible_rows && total_width <= visible_width) {
- //thanks yessopie for this clever bit of logic
- use_hscroll=false;
- use_vscroll=false;
-
- } else {
-
- if (total_rows > visible_rows && total_width <= visible_width - vscroll_pixels) {
- //thanks yessopie for this clever bit of logic
- use_hscroll=false;
- }
-
- if (total_rows <= visible_rows - hscroll_rows && total_width > visible_width) {
- //thanks yessopie for this clever bit of logic
- use_vscroll=false;
- }
- }
-
- updating_scrolls=true;
-
- if (use_vscroll) {
-
- v_scroll->show();
- v_scroll->set_max(total_rows);
- v_scroll->set_page(visible_rows);
-
- v_scroll->set_val(cursor.line_ofs);
-
- } else {
- cursor.line_ofs = 0;
- v_scroll->hide();
- }
-
- if (use_hscroll) {
-
- h_scroll->show();
- h_scroll->set_max(total_width);
- h_scroll->set_page(visible_width);
- h_scroll->set_val(cursor.x_ofs);
- } else {
-
- h_scroll->hide();
- }
-
-
-
- updating_scrolls=false;
+
+
+ Size2 size = get_size();
+ Size2 hmin = h_scroll->get_combined_minimum_size();
+ Size2 vmin = v_scroll->get_combined_minimum_size();
+
+
+
+ v_scroll->set_begin( Point2(size.width - vmin.width, cache.style_normal->get_margin(MARGIN_TOP)) );
+ v_scroll->set_end( Point2(size.width, size.height - cache.style_normal->get_margin(MARGIN_TOP) - cache.style_normal->get_margin(MARGIN_BOTTOM)) );
+
+ h_scroll->set_begin( Point2( 0, size.height - hmin.height) );
+ h_scroll->set_end( Point2(size.width-vmin.width, size.height) );
+
+
+ int hscroll_rows = ((hmin.height-1)/get_row_height())+1;
+ int visible_rows = get_visible_rows();
+ int total_rows = text.size() * cache.line_spacing;
+
+ int vscroll_pixels = v_scroll->get_combined_minimum_size().width;
+ int visible_width = size.width - cache.style_normal->get_minimum_size().width;
+ int total_width = text.get_max_width();
+
+ bool use_hscroll=true;
+ bool use_vscroll=true;
+
+ if (total_rows <= visible_rows && total_width <= visible_width) {
+ //thanks yessopie for this clever bit of logic
+ use_hscroll=false;
+ use_vscroll=false;
+
+ } else {
+
+ if (total_rows > visible_rows && total_width <= visible_width - vscroll_pixels) {
+ //thanks yessopie for this clever bit of logic
+ use_hscroll=false;
+ }
+
+ if (total_rows <= visible_rows - hscroll_rows && total_width > visible_width) {
+ //thanks yessopie for this clever bit of logic
+ use_vscroll=false;
+ }
+ }
+
+ updating_scrolls=true;
+
+ if (use_vscroll) {
+
+ v_scroll->show();
+ v_scroll->set_max(total_rows);
+ v_scroll->set_page(visible_rows);
+
+ v_scroll->set_val(cursor.line_ofs);
+
+ } else {
+ cursor.line_ofs = 0;
+ v_scroll->hide();
+ }
+
+ if (use_hscroll) {
+
+ h_scroll->show();
+ h_scroll->set_max(total_width);
+ h_scroll->set_page(visible_width);
+ h_scroll->set_val(cursor.x_ofs);
+ } else {
+
+ h_scroll->hide();
+ }
+
+
+
+ updating_scrolls=false;
}
void TextEdit::_notification(int p_what) {
-
- switch(p_what) {
- case NOTIFICATION_ENTER_TREE: {
-
- _update_caches();
- if (cursor_changed_dirty)
- MessageQueue::get_singleton()->push_call(this,"_cursor_changed_emit");
- if (text_changed_dirty)
- MessageQueue::get_singleton()->push_call(this,"_text_changed_emit");
-
- } break;
- case NOTIFICATION_RESIZED: {
-
- cache.size=get_size();
- adjust_viewport_to_cursor();
-
-
- } break;
- case NOTIFICATION_THEME_CHANGED: {
-
- _update_caches();
- };
- case NOTIFICATION_DRAW: {
-
- int line_number_char_count=0;
-
- {
- int lc=text.size()+1;
- cache.line_number_w=0;
- while(lc) {
- cache.line_number_w+=1;
- lc/=10;
- };
-
- if (line_numbers) {
-
- line_number_char_count=cache.line_number_w;
- cache.line_number_w=(cache.line_number_w+1)*cache.font->get_char_size('0').width;
- } else {
- cache.line_number_w=0;
- }
-
-
- }
- _update_scrollbars();
-
-
- RID ci = get_canvas_item();
- int xmargin_beg=cache.style_normal->get_margin(MARGIN_LEFT)+cache.line_number_w;
- int xmargin_end=cache.size.width-cache.style_normal->get_margin(MARGIN_RIGHT);
- //let's do it easy for now:
- cache.style_normal->draw(ci,Rect2(Point2(),cache.size));
- if (has_focus())
- cache.style_focus->draw(ci,Rect2(Point2(),cache.size));
-
-
- int ascent=cache.font->get_ascent();
-
- int visible_rows = get_visible_rows();
-
- int tab_w = cache.font->get_char_size(' ').width*tab_size;
-
- Color color = cache.font_color;
- int in_region=-1;
-
- if (syntax_coloring) {
-
- if (custom_bg_color.a>0.01) {
-
- Point2i ofs = Point2i(cache.style_normal->get_offset())/2.0;
- VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(ofs, get_size()-cache.style_normal->get_minimum_size()+ofs),custom_bg_color);
- }
- //compute actual region to start (may be inside say, a comment).
- //slow in very large documments :( but ok for source!
-
- for(int i=0;i<cursor.line_ofs;i++) {
-
- const Map<int,Text::ColorRegionInfo>& cri_map=text.get_color_region_info(i);
-
- if (in_region>=0 && color_regions[in_region].line_only) {
- in_region=-1; //reset regions that end at end of line
- }
-
- for( const Map<int,Text::ColorRegionInfo>::Element* E= cri_map.front();E;E=E->next() ) {
-
- const Text::ColorRegionInfo &cri=E->get();
-
- if (in_region==-1) {
-
- if (!cri.end) {
-
- in_region=cri.region;
- }
- } else if (in_region==cri.region && !color_regions[cri.region].line_only) { //ignore otherwise
-
- if (cri.end || color_regions[cri.region].eq) {
-
- in_region=-1;
- }
- }
- }
- }
- }
-
- int deregion=0; //force it to clear inrgion
- Point2 cursor_pos;
-
- for (int i=0;i<visible_rows;i++) {
-
- int line=i+cursor.line_ofs;
-
- if (line<0 || line>=(int)text.size())
- continue;
-
- const String &str=text[line];
-
- int char_margin=xmargin_beg-cursor.x_ofs;
- int char_ofs=0;
- int ofs_y=i*get_row_height()+cache.line_spacing/2;
- bool prev_is_char=false;
- bool in_keyword=false;
- Color keyword_color;
-
- if (cache.line_number_w) {
- Color fcol = cache.font_color;
- fcol.a*=0.4;
- String fc = String::num(line+1);
- while (fc.length() < line_number_char_count) {
- fc="0"+fc;
- }
-
- cache.font->draw(ci,Point2(cache.style_normal->get_margin(MARGIN_LEFT),ofs_y+cache.font->get_ascent()),fc,fcol);
- }
-
- const Map<int,Text::ColorRegionInfo>& cri_map=text.get_color_region_info(line);
-
-
- if (text.is_marked(line)) {
-
- VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.mark_color);
- }
-
- if (text.is_breakpoint(line)) {
-
- VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.breakpoint_color);
- }
-
-
- if (line==cursor.line) {
-
- VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.current_line_color);
-
- }
- for (int j=0;j<str.length();j++) {
-
- //look for keyword
-
- if (deregion>0) {
- deregion--;
- if (deregion==0)
- in_region=-1;
- }
- if (syntax_coloring && deregion==0) {
-
-
- color = cache.font_color; //reset
- //find keyword
- bool is_char = _is_text_char(str[j]);
- bool is_symbol=_is_symbol(str[j]);
-
- if (j==0 && in_region>=0 && color_regions[in_region].line_only) {
- in_region=-1; //reset regions that end at end of line
- }
-
- if (is_symbol && cri_map.has(j)) {
-
-
- const Text::ColorRegionInfo &cri=cri_map[j];
-
- if (in_region==-1) {
-
- if (!cri.end) {
-
- in_region=cri.region;
- }
- } else if (in_region==cri.region && !color_regions[cri.region].line_only) { //ignore otherwise
-
- if (cri.end || color_regions[cri.region].eq) {
-
- deregion=color_regions[cri.region].eq?color_regions[cri.region].begin_key.length():color_regions[cri.region].end_key.length();
- }
- }
- }
-
- if (!is_char)
- in_keyword=false;
-
- if (in_region==-1 && !in_keyword && is_char && !prev_is_char) {
-
- int to=j;
- while(_is_text_char(str[to]) && to<str.length())
- to++;
-
- uint32_t hash = String::hash(&str[j],to-j);
- StrRange range(&str[j],to-j);
-
- const Color *col=keywords.custom_getptr(range,hash);
-
- if (col) {
-
- in_keyword=true;
- keyword_color=*col;
- }
- }
-
-
- if (in_region>=0)
- color=color_regions[in_region].color;
- else if (in_keyword)
- color=keyword_color;
- else if (is_symbol)
- color=symbol_color;
-
- prev_is_char=is_char;
-
- }
- int char_w;
-
- //handle tabulator
-
-
- if (str[j]=='\t') {
- int left = char_ofs%tab_w;
- if (left==0)
- char_w=tab_w;
- else
- char_w=tab_w-char_ofs%tab_w; // is right...
-
- } else {
- char_w=cache.font->get_char_size(str[j],str[j+1]).width;
- }
-
- if ( (char_ofs+char_margin)<xmargin_beg) {
- char_ofs+=char_w;
- continue;
- }
-
- if ( (char_ofs+char_margin+char_w)>=xmargin_end) {
- if (syntax_coloring)
- continue;
- else
- break;
- }
-
- bool in_selection = (selection.active && line>=selection.from_line && line<=selection.to_line && (line>selection.from_line || j>=selection.from_column) && (line<selection.to_line || j<selection.to_column));
-
-
- if (in_selection) {
- //inside selection!
- VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(Point2i( char_ofs+char_margin, ofs_y ), Size2i(char_w,get_row_height())),cache.selection_color);
- }
-
-
-
- if (str[j]>=32)
- cache.font->draw_char(ci,Point2i( char_ofs+char_margin, ofs_y+ascent),str[j],str[j+1],in_selection?cache.font_selected_color:color);
- else if (draw_tabs && str[j]=='\t') {
- int yofs= (get_row_height() - cache.tab_icon->get_height())/2;
- cache.tab_icon->draw(ci, Point2(char_ofs+char_margin,ofs_y+yofs),in_selection?cache.font_selected_color:color);
- }
-
-
- if (cursor.column==j && cursor.line==line) {
-
- cursor_pos = Point2i( char_ofs+char_margin, ofs_y );
- VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(cursor_pos, Size2i(1,get_row_height())),cache.font_color);
-
-
- }
- char_ofs+=char_w;
-
- }
-
- if (cursor.column==str.length() && cursor.line==line) {
-
- cursor_pos=Point2i( char_ofs+char_margin, ofs_y );
- VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(cursor_pos, Size2i(1,get_row_height())),cache.font_color);
-
- }
- }
-
- if (completion_active) {
- // code completion box
- Ref<StyleBox> csb = get_stylebox("completion");
- Ref<StyleBox> csel = get_stylebox("completion_selected");
- int maxlines = get_constant("completion_lines");
- int cmax_width = get_constant("completion_max_width")*cache.font->get_char_size('x').x;
- Color existing = get_color("completion_existing");
- int scrollw = get_constant("completion_scroll_width");
- Color scrollc = get_color("completion_scroll_color");
-
-
-
- int lines = MIN(completion_options.size(),maxlines);
- int w=0;
- int h=lines*get_row_height();
- int nofs = cache.font->get_string_size(completion_base).width;
-
-
- if (completion_options.size() < 50) {
- for(int i=0;i<completion_options.size();i++) {
- int w2=MIN(cache.font->get_string_size(completion_options[i]).x,cmax_width);
- if (w2>w)
- w=w2;
- }
- } else {
- w=cmax_width;
- }
-
- int th = h + csb->get_minimum_size().y;
- if (cursor_pos.y+get_row_height()+th > get_size().height) {
- completion_rect.pos.y=cursor_pos.y-th;
- } else {
- completion_rect.pos.y=cursor_pos.y+get_row_height()+csb->get_offset().y;
- }
-
- if (cursor_pos.x-nofs+w+scrollw > get_size().width) {
- completion_rect.pos.x=get_size().width-w-scrollw;
- } else {
- completion_rect.pos.x=cursor_pos.x-nofs;
- }
-
- completion_rect.size.width=w;
- completion_rect.size.height=h;
- if (completion_options.size()<=maxlines)
- scrollw=0;
-
- draw_style_box(csb,Rect2(completion_rect.pos-csb->get_offset(),completion_rect.size+csb->get_minimum_size()+Size2(scrollw,0)));
-
-
- int line_from = CLAMP(completion_index - lines/2, 0, completion_options.size() - lines);
- draw_style_box(csel,Rect2(Point2(completion_rect.pos.x,completion_rect.pos.y+(completion_index-line_from)*get_row_height()),Size2(completion_rect.size.width,get_row_height())));
-
- draw_rect(Rect2(completion_rect.pos,Size2(nofs,completion_rect.size.height)),existing);
-
- for(int i=0;i<lines;i++) {
-
- int l = line_from + i;
- ERR_CONTINUE( l < 0 || l>= completion_options.size());
- draw_string(cache.font,Point2(completion_rect.pos.x,completion_rect.pos.y+i*get_row_height()+cache.font->get_ascent()),completion_options[l],cache.font_color,completion_rect.size.width);
- }
-
- if (scrollw) {
- //draw a small scroll rectangle to show a position in the options
- float r = maxlines / (float)completion_options.size();
- float o = line_from / (float)completion_options.size();
- draw_rect(Rect2(completion_rect.pos.x+completion_rect.size.width,completion_rect.pos.y+o*completion_rect.size.y,scrollw,completion_rect.size.y*r),scrollc);
- }
-
- completion_line_ofs=line_from;
-
- }
-
-
-
- } break;
- case NOTIFICATION_FOCUS_ENTER: {
-
- if (OS::get_singleton()->has_virtual_keyboard())
- OS::get_singleton()->show_virtual_keyboard(get_text(),get_global_rect());
-
- } break;
- case NOTIFICATION_FOCUS_EXIT: {
-
- if (OS::get_singleton()->has_virtual_keyboard())
- OS::get_singleton()->hide_virtual_keyboard();
-
- } break;
-
- }
+
+ switch(p_what) {
+ case NOTIFICATION_ENTER_TREE: {
+
+ _update_caches();
+ if (cursor_changed_dirty)
+ MessageQueue::get_singleton()->push_call(this,"_cursor_changed_emit");
+ if (text_changed_dirty)
+ MessageQueue::get_singleton()->push_call(this,"_text_changed_emit");
+
+ } break;
+ case NOTIFICATION_RESIZED: {
+
+ cache.size=get_size();
+ adjust_viewport_to_cursor();
+
+
+ } break;
+ case NOTIFICATION_THEME_CHANGED: {
+
+ _update_caches();
+ };
+ case NOTIFICATION_DRAW: {
+
+ int line_number_char_count=0;
+
+ {
+ int lc=text.size()+1;
+ cache.line_number_w=0;
+ while(lc) {
+ cache.line_number_w+=1;
+ lc/=10;
+ };
+
+ if (line_numbers) {
+
+ line_number_char_count=cache.line_number_w;
+ cache.line_number_w=(cache.line_number_w+1)*cache.font->get_char_size('0').width;
+ } else {
+ cache.line_number_w=0;
+ }
+
+
+ }
+ _update_scrollbars();
+
+
+ RID ci = get_canvas_item();
+ int xmargin_beg=cache.style_normal->get_margin(MARGIN_LEFT)+cache.line_number_w;
+ int xmargin_end=cache.size.width-cache.style_normal->get_margin(MARGIN_RIGHT);
+ //let's do it easy for now:
+ cache.style_normal->draw(ci,Rect2(Point2(),cache.size));
+ if (has_focus())
+ cache.style_focus->draw(ci,Rect2(Point2(),cache.size));
+
+
+ int ascent=cache.font->get_ascent();
+
+ int visible_rows = get_visible_rows();
+
+ int tab_w = cache.font->get_char_size(' ').width*tab_size;
+
+ Color color = cache.font_color;
+ int in_region=-1;
+
+ if (syntax_coloring) {
+
+ if (custom_bg_color.a>0.01) {
+
+ Point2i ofs = Point2i(cache.style_normal->get_offset())/2.0;
+ VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(ofs, get_size()-cache.style_normal->get_minimum_size()+ofs),custom_bg_color);
+ }
+ //compute actual region to start (may be inside say, a comment).
+ //slow in very large documments :( but ok for source!
+
+ for(int i=0;i<cursor.line_ofs;i++) {
+
+ const Map<int,Text::ColorRegionInfo>& cri_map=text.get_color_region_info(i);
+
+ if (in_region>=0 && color_regions[in_region].line_only) {
+ in_region=-1; //reset regions that end at end of line
+ }
+
+ for( const Map<int,Text::ColorRegionInfo>::Element* E= cri_map.front();E;E=E->next() ) {
+
+ const Text::ColorRegionInfo &cri=E->get();
+
+ if (in_region==-1) {
+
+ if (!cri.end) {
+
+ in_region=cri.region;
+ }
+ } else if (in_region==cri.region && !color_regions[cri.region].line_only) { //ignore otherwise
+
+ if (cri.end || color_regions[cri.region].eq) {
+
+ in_region=-1;
+ }
+ }
+ }
+ }
+ }
+
+ int brace_open_match_line=-1;
+ int brace_open_match_column=-1;
+ bool brace_open_matching=false;
+ bool brace_open_mismatch=false;
+ int brace_close_match_line=-1;
+ int brace_close_match_column=-1;
+ bool brace_close_matching=false;
+ bool brace_close_mismatch=false;
+
+
+ if (brace_matching_enabled) {
+
+ if (cursor.column<text[cursor.line].length()) {
+ //check for open
+ CharType c = text[cursor.line][cursor.column];
+ CharType closec=0;
+
+ if (c=='[') {
+ closec=']';
+ } else if (c=='{') {
+ closec='}';
+ } else if (c=='(') {
+ closec=')';
+ }
+
+ if (closec!=0) {
+
+ int stack=1;
+
+
+ for(int i=cursor.line;i<text.size();i++) {
+
+ int from = i==cursor.line?cursor.column+1:0;
+ for(int j=from;j<text[i].length();j++) {
+
+ CharType cc = text[i][j];
+ if (cc==c)
+ stack++;
+ else if (cc==closec)
+ stack--;
+
+ if (stack==0) {
+ brace_open_match_line=i;
+ brace_open_match_column=j;
+ brace_open_matching=true;
+
+ break;
+ }
+ }
+ if (brace_open_match_line!=-1)
+ break;
+ }
+
+ if (!brace_open_matching)
+ brace_open_mismatch=true;
+
+
+ }
+ }
+
+ if (cursor.column>0) {
+ CharType c = text[cursor.line][cursor.column-1];
+ CharType closec=0;
+
+
+
+ if (c==']') {
+ closec='[';
+ } else if (c=='}') {
+ closec='{';
+ } else if (c==')') {
+ closec='(';
+ }
+
+ if (closec!=0) {
+
+ int stack=1;
+
+
+ for(int i=cursor.line;i>=0;i--) {
+
+ int from = i==cursor.line?cursor.column-2:text[i].length()-1;
+ for(int j=from;j>=0;j--) {
+
+ CharType cc = text[i][j];
+ if (cc==c)
+ stack++;
+ else if (cc==closec)
+ stack--;
+
+ if (stack==0) {
+ brace_close_match_line=i;
+ brace_close_match_column=j;
+ brace_close_matching=true;
+
+ break;
+ }
+ }
+ if (brace_close_match_line!=-1)
+ break;
+ }
+
+ if (!brace_close_matching)
+ brace_close_mismatch=true;
+
+
+ }
+
+
+ }
+ }
+
+
+ int deregion=0; //force it to clear inrgion
+ Point2 cursor_pos;
+
+ for (int i=0;i<visible_rows;i++) {
+
+ int line=i+cursor.line_ofs;
+
+ if (line<0 || line>=(int)text.size())
+ continue;
+
+ const String &str=text[line];
+
+ int char_margin=xmargin_beg-cursor.x_ofs;
+ int char_ofs=0;
+ int ofs_y=i*get_row_height()+cache.line_spacing/2;
+ bool prev_is_char=false;
+ bool in_keyword=false;
+ Color keyword_color;
+
+ if (cache.line_number_w) {
+ Color fcol = cache.font_color;
+ fcol.a*=0.4;
+ String fc = String::num(line+1);
+ while (fc.length() < line_number_char_count) {
+ fc="0"+fc;
+ }
+
+ cache.font->draw(ci,Point2(cache.style_normal->get_margin(MARGIN_LEFT),ofs_y+cache.font->get_ascent()),fc,fcol);
+ }
+
+ const Map<int,Text::ColorRegionInfo>& cri_map=text.get_color_region_info(line);
+
+
+ if (text.is_marked(line)) {
+
+ VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.mark_color);
+ }
+
+ if (text.is_breakpoint(line)) {
+
+ VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.breakpoint_color);
+ }
+
+
+ if (line==cursor.line) {
+
+ VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.current_line_color);
+
+ }
+ for (int j=0;j<str.length();j++) {
+
+ //look for keyword
+
+ if (deregion>0) {
+ deregion--;
+ if (deregion==0)
+ in_region=-1;
+ }
+ if (syntax_coloring && deregion==0) {
+
+
+ color = cache.font_color; //reset
+ //find keyword
+ bool is_char = _is_text_char(str[j]);
+ bool is_symbol=_is_symbol(str[j]);
+
+ if (j==0 && in_region>=0 && color_regions[in_region].line_only) {
+ in_region=-1; //reset regions that end at end of line
+ }
+
+ if (is_symbol && cri_map.has(j)) {
+
+
+ const Text::ColorRegionInfo &cri=cri_map[j];
+
+ if (in_region==-1) {
+
+ if (!cri.end) {
+
+ in_region=cri.region;
+ }
+ } else if (in_region==cri.region && !color_regions[cri.region].line_only) { //ignore otherwise
+
+ if (cri.end || color_regions[cri.region].eq) {
+
+ deregion=color_regions[cri.region].eq?color_regions[cri.region].begin_key.length():color_regions[cri.region].end_key.length();
+ }
+ }
+ }
+
+ if (!is_char)
+ in_keyword=false;
+
+ if (in_region==-1 && !in_keyword && is_char && !prev_is_char) {
+
+ int to=j;
+ while(_is_text_char(str[to]) && to<str.length())
+ to++;
+
+ uint32_t hash = String::hash(&str[j],to-j);
+ StrRange range(&str[j],to-j);
+
+ const Color *col=keywords.custom_getptr(range,hash);
+
+ if (col) {
+
+ in_keyword=true;
+ keyword_color=*col;
+ }
+ }
+
+
+ if (in_region>=0)
+ color=color_regions[in_region].color;
+ else if (in_keyword)
+ color=keyword_color;
+ else if (is_symbol)
+ color=symbol_color;
+
+ prev_is_char=is_char;
+
+ }
+ int char_w;
+
+ //handle tabulator
+
+
+ if (str[j]=='\t') {
+ int left = char_ofs%tab_w;
+ if (left==0)
+ char_w=tab_w;
+ else
+ char_w=tab_w-char_ofs%tab_w; // is right...
+
+ } else {
+ char_w=cache.font->get_char_size(str[j],str[j+1]).width;
+ }
+
+ if ( (char_ofs+char_margin)<xmargin_beg) {
+ char_ofs+=char_w;
+ continue;
+ }
+
+ if ( (char_ofs+char_margin+char_w)>=xmargin_end) {
+ if (syntax_coloring)
+ continue;
+ else
+ break;
+ }
+
+ bool in_selection = (selection.active && line>=selection.from_line && line<=selection.to_line && (line>selection.from_line || j>=selection.from_column) && (line<selection.to_line || j<selection.to_column));
+
+
+ if (in_selection) {
+ //inside selection!
+ VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(Point2i( char_ofs+char_margin, ofs_y ), Size2i(char_w,get_row_height())),cache.selection_color);
+ }
+
+
+ if (brace_matching_enabled) {
+ if ( (brace_open_match_line==line && brace_open_match_column==j) ||
+ (cursor.column==j && cursor.line==line && (brace_open_matching||brace_open_mismatch))) {
+
+ if (brace_open_mismatch)
+ color=cache.brace_mismatch_color;
+ cache.font->draw_char(ci,Point2i( char_ofs+char_margin, ofs_y+ascent),'_',str[j+1],in_selection?cache.font_selected_color:color);
+
+ }
+
+ if (
+ (brace_close_match_line==line && brace_close_match_column==j) ||
+ (cursor.column==j+1 && cursor.line==line && (brace_close_matching||brace_close_mismatch))) {
+
+
+ if (brace_close_mismatch)
+ color=cache.brace_mismatch_color;
+ cache.font->draw_char(ci,Point2i( char_ofs+char_margin, ofs_y+ascent),'_',str[j+1],in_selection?cache.font_selected_color:color);
+
+ }
+ }
+
+
+ if (str[j]>=32)
+ cache.font->draw_char(ci,Point2i( char_ofs+char_margin, ofs_y+ascent),str[j],str[j+1],in_selection?cache.font_selected_color:color);
+
+ else if (draw_tabs && str[j]=='\t') {
+ int yofs= (get_row_height() - cache.tab_icon->get_height())/2;
+ cache.tab_icon->draw(ci, Point2(char_ofs+char_margin,ofs_y+yofs),in_selection?cache.font_selected_color:color);
+ }
+
+
+ if (cursor.column==j && cursor.line==line) {
+
+ cursor_pos = Point2i( char_ofs+char_margin, ofs_y );
+ VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(cursor_pos, Size2i(1,get_row_height())),cache.font_color);
+
+
+ }
+ char_ofs+=char_w;
+
+ }
+
+ if (cursor.column==str.length() && cursor.line==line) {
+
+ cursor_pos=Point2i( char_ofs+char_margin, ofs_y );
+ VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(cursor_pos, Size2i(1,get_row_height())),cache.font_color);
+
+ }
+ }
+
+
+ if (completion_active) {
+ // code completion box
+ Ref<StyleBox> csb = get_stylebox("completion");
+ Ref<StyleBox> csel = get_stylebox("completion_selected");
+ int maxlines = get_constant("completion_lines");
+ int cmax_width = get_constant("completion_max_width")*cache.font->get_char_size('x').x;
+ Color existing = get_color("completion_existing");
+ existing.a=0.2;
+ int scrollw = get_constant("completion_scroll_width");
+ Color scrollc = get_color("completion_scroll_color");
+
+
+
+ int lines = MIN(completion_options.size(),maxlines);
+ int w=0;
+ int h=lines*get_row_height();
+ int nofs = cache.font->get_string_size(completion_base).width;
+
+
+ if (completion_options.size() < 50) {
+ for(int i=0;i<completion_options.size();i++) {
+ int w2=MIN(cache.font->get_string_size(completion_options[i]).x,cmax_width);
+ if (w2>w)
+ w=w2;
+ }
+ } else {
+ w=cmax_width;
+ }
+
+ int th = h + csb->get_minimum_size().y;
+ if (cursor_pos.y+get_row_height()+th > get_size().height) {
+ completion_rect.pos.y=cursor_pos.y-th;
+ } else {
+ completion_rect.pos.y=cursor_pos.y+get_row_height()+csb->get_offset().y;
+
+ }
+
+ if (cursor_pos.x-nofs+w+scrollw > get_size().width) {
+ completion_rect.pos.x=get_size().width-w-scrollw;
+ } else {
+ completion_rect.pos.x=cursor_pos.x-nofs;
+ }
+
+ completion_rect.size.width=w+2;
+ completion_rect.size.height=h;
+ if (completion_options.size()<=maxlines)
+ scrollw=0;
+
+ draw_style_box(csb,Rect2(completion_rect.pos-csb->get_offset(),completion_rect.size+csb->get_minimum_size()+Size2(scrollw,0)));
+
+
+ int line_from = CLAMP(completion_index - lines/2, 0, completion_options.size() - lines);
+ draw_style_box(csel,Rect2(Point2(completion_rect.pos.x,completion_rect.pos.y+(completion_index-line_from)*get_row_height()),Size2(completion_rect.size.width,get_row_height())));
+
+ draw_rect(Rect2(completion_rect.pos,Size2(nofs,completion_rect.size.height)),existing);
+
+
+
+
+ for(int i=0;i<lines;i++) {
+
+ int l = line_from + i;
+ ERR_CONTINUE( l < 0 || l>= completion_options.size());
+ Color text_color = cache.font_color;
+ for(int j=0;j<color_regions.size();j++) {
+ if (completion_options[l].begins_with(color_regions[j].begin_key)) {
+ text_color=color_regions[j].color;
+ }
+ }
+ draw_string(cache.font,Point2(completion_rect.pos.x,completion_rect.pos.y+i*get_row_height()+cache.font->get_ascent()),completion_options[l],text_color,completion_rect.size.width);
+ }
+
+ if (scrollw) {
+ //draw a small scroll rectangle to show a position in the options
+ float r = maxlines / (float)completion_options.size();
+ float o = line_from / (float)completion_options.size();
+ draw_rect(Rect2(completion_rect.pos.x+completion_rect.size.width,completion_rect.pos.y+o*completion_rect.size.y,scrollw,completion_rect.size.y*r),scrollc);
+ }
+
+ completion_line_ofs=line_from;
+
+ }
+
+ if (completion_hint!="") {
+
+ Ref<StyleBox> sb = get_stylebox("panel","TooltipPanel");
+ Ref<Font> font = cache.font;
+ Color font_color = get_color("font_color","TooltipLabel");
+
+
+ int max_w=0;
+ int sc = completion_hint.get_slice_count("\n");
+ int offset=0;
+ int spacing=0;
+ for(int i=0;i<sc;i++) {
+
+ String l = completion_hint.get_slice("\n",i);
+ int len = font->get_string_size(l).x;
+ max_w = MAX(len,max_w);
+ if (i==0) {
+ offset = font->get_string_size(l.substr(0,l.find(String::chr(0xFFFF)))).x;
+ } else {
+ spacing+=cache.line_spacing;
+ }
+
+
+ }
+
+
+
+ Size2 size = Size2(max_w,sc*font->get_height()+spacing);
+ Size2 minsize = size+sb->get_minimum_size();
+
+
+ if (completion_hint_offset==-0xFFFF) {
+ completion_hint_offset=cursor_pos.x-offset;
+ }
+
+
+ Point2 hint_ofs = Vector2(completion_hint_offset,cursor_pos.y-minsize.y);
+ draw_style_box(sb,Rect2(hint_ofs,minsize));
+
+ spacing=0;
+ for(int i=0;i<sc;i++) {
+ int begin=0;
+ int end=0;
+ String l = completion_hint.get_slice("\n",i);
+
+ if (l.find(String::chr(0xFFFF))!=-1) {
+ begin = font->get_string_size(l.substr(0,l.find(String::chr(0xFFFF)))).x;
+ end = font->get_string_size(l.substr(0,l.rfind(String::chr(0xFFFF)))).x;
+ }
+
+ draw_string(font,hint_ofs+sb->get_offset()+Vector2(0,font->get_ascent()+font->get_height()*i+spacing),l.replace(String::chr(0xFFFF),""),font_color);
+ if (end>0) {
+ Vector2 b = hint_ofs+sb->get_offset()+Vector2(begin,font->get_height()+font->get_height()*i+spacing-1);
+ draw_line(b,b+Vector2(end-begin,0),font_color);
+ }
+ spacing+=cache.line_spacing;
+ }
+ }
+
+
+ } break;
+ case NOTIFICATION_FOCUS_ENTER: {
+
+ if (OS::get_singleton()->has_virtual_keyboard())
+ OS::get_singleton()->show_virtual_keyboard(get_text(),get_global_rect());
+
+ } break;
+ case NOTIFICATION_FOCUS_EXIT: {
+
+ if (OS::get_singleton()->has_virtual_keyboard())
+ OS::get_singleton()->hide_virtual_keyboard();
+
+ } break;
+
+ }
}
void TextEdit::_consume_pair_symbol(CharType ch) {
-
- int cursor_position_to_move = cursor_get_column() + 1;
-
- CharType ch_single[2] = {ch, 0};
- CharType ch_single_pair[2] = {_get_right_pair_symbol(ch), 0};
- CharType ch_pair[3] = {ch, _get_right_pair_symbol(ch), 0};
-
- if(is_selection_active()) {
-
- int new_column,new_line;
-
- _begin_compex_operation();
- _insert_text(get_selection_from_line(), get_selection_from_column(),
- ch_single,
- &new_line, &new_column);
-
- int to_col_offset = 0;
- if(get_selection_from_line() == get_selection_to_line())
- to_col_offset = 1;
-
- _insert_text(get_selection_to_line(),
- get_selection_to_column() + to_col_offset,
- ch_single_pair,
- &new_line,&new_column);
- _end_compex_operation();
-
- cursor_set_line(get_selection_to_line());
- cursor_set_column(get_selection_to_column() + to_col_offset);
-
- deselect();
- update();
- return;
- }
-
- if( (ch == '\'' || ch == '"') &&
- cursor_get_column() > 0 &&
- _is_text_char(text[cursor.line][cursor_get_column() - 1])
- ) {
- insert_text_at_cursor(ch_single);
- cursor_set_column(cursor_position_to_move);
- return;
- }
-
- if(cursor_get_column() < text[cursor.line].length()) {
- if(_is_text_char(text[cursor.line][cursor_get_column()])) {
- insert_text_at_cursor(ch_single);
- cursor_set_column(cursor_position_to_move);
- return;
- }
- if( _is_pair_right_symbol(ch) &&
- text[cursor.line][cursor_get_column()] == ch
- ) {
- cursor_set_column(cursor_position_to_move);
- return;
- }
- }
-
-
- insert_text_at_cursor(ch_pair);
- cursor_set_column(cursor_position_to_move);
- return;
-
+
+ int cursor_position_to_move = cursor_get_column() + 1;
+
+ CharType ch_single[2] = {ch, 0};
+ CharType ch_single_pair[2] = {_get_right_pair_symbol(ch), 0};
+ CharType ch_pair[3] = {ch, _get_right_pair_symbol(ch), 0};
+
+ if(is_selection_active()) {
+
+ int new_column,new_line;
+
+ _begin_compex_operation();
+ _insert_text(get_selection_from_line(), get_selection_from_column(),
+ ch_single,
+ &new_line, &new_column);
+
+ int to_col_offset = 0;
+ if(get_selection_from_line() == get_selection_to_line())
+ to_col_offset = 1;
+
+ _insert_text(get_selection_to_line(),
+ get_selection_to_column() + to_col_offset,
+ ch_single_pair,
+ &new_line,&new_column);
+ _end_compex_operation();
+
+ cursor_set_line(get_selection_to_line());
+ cursor_set_column(get_selection_to_column() + to_col_offset);
+
+ deselect();
+ update();
+ return;
+ }
+
+ if( (ch == '\'' || ch == '"') &&
+ cursor_get_column() > 0 &&
+ _is_text_char(text[cursor.line][cursor_get_column() - 1])
+ ) {
+ insert_text_at_cursor(ch_single);
+ cursor_set_column(cursor_position_to_move);
+ return;
+ }
+
+ if(cursor_get_column() < text[cursor.line].length()) {
+ if(_is_text_char(text[cursor.line][cursor_get_column()])) {
+ insert_text_at_cursor(ch_single);
+ cursor_set_column(cursor_position_to_move);
+ return;
+ }
+ if( _is_pair_right_symbol(ch) &&
+ text[cursor.line][cursor_get_column()] == ch
+ ) {
+ cursor_set_column(cursor_position_to_move);
+ return;
+ }
+ }
+
+
+ insert_text_at_cursor(ch_pair);
+ cursor_set_column(cursor_position_to_move);
+ return;
+
}
void TextEdit::_consume_backspace_for_pair_symbol(int prev_line, int prev_column) {
-
- bool remove_right_symbol = false;
-
- if(cursor.column < text[cursor.line].length() && cursor.column > 0) {
-
- CharType left_char = text[cursor.line][cursor.column - 1];
- CharType right_char = text[cursor.line][cursor.column];
-
- if(right_char == _get_right_pair_symbol(left_char)) {
- remove_right_symbol = true;
- }
-
- }
- if(remove_right_symbol) {
- _remove_text(prev_line,prev_column,cursor.line,cursor.column + 1);
- } else {
- _remove_text(prev_line,prev_column,cursor.line,cursor.column);
- }
-
+
+ bool remove_right_symbol = false;
+
+ if(cursor.column < text[cursor.line].length() && cursor.column > 0) {
+
+ CharType left_char = text[cursor.line][cursor.column - 1];
+ CharType right_char = text[cursor.line][cursor.column];
+
+ if(right_char == _get_right_pair_symbol(left_char)) {
+ remove_right_symbol = true;
+ }
+
+ }
+ if(remove_right_symbol) {
+ _remove_text(prev_line,prev_column,cursor.line,cursor.column + 1);
+ } else {
+ _remove_text(prev_line,prev_column,cursor.line,cursor.column);
+ }
+
}
void TextEdit::backspace_at_cursor() {
-
- if (cursor.column==0 && cursor.line==0)
- return;
-
- int prev_line = cursor.column?cursor.line:cursor.line-1;
- int prev_column = cursor.column?(cursor.column-1):(text[cursor.line-1].length());
- if(auto_brace_completion_enabled &&
- cursor.column > 0 &&
- _is_pair_left_symbol(text[cursor.line][cursor.column - 1])) {
- _consume_backspace_for_pair_symbol(prev_line, prev_column);
- } else {
- _remove_text(prev_line,prev_column,cursor.line,cursor.column);
- }
-
- cursor_set_line(prev_line);
- cursor_set_column(prev_column);
-
+ if (readonly)
+ return;
+
+ if (cursor.column==0 && cursor.line==0)
+ return;
+
+ int prev_line = cursor.column?cursor.line:cursor.line-1;
+ int prev_column = cursor.column?(cursor.column-1):(text[cursor.line-1].length());
+ if(auto_brace_completion_enabled &&
+ cursor.column > 0 &&
+ _is_pair_left_symbol(text[cursor.line][cursor.column - 1])) {
+ _consume_backspace_for_pair_symbol(prev_line, prev_column);
+ } else {
+ _remove_text(prev_line,prev_column,cursor.line,cursor.column);
+ }
+
+ cursor_set_line(prev_line);
+ cursor_set_column(prev_column);
+
}
bool TextEdit::_get_mouse_pos(const Point2i& p_mouse, int &r_row, int &r_col) const {
-
- int row=p_mouse.y;
- row-=cache.style_normal->get_margin(MARGIN_TOP);
- row/=get_row_height();
-
- if (row<0 || row>=get_visible_rows())
- return false;
-
- row+=cursor.line_ofs;
- int col=0;
-
- if (row>=text.size()) {
-
- row=text.size()-1;
- col=text[row].size();
- } else {
-
- col=p_mouse.x-(cache.style_normal->get_margin(MARGIN_LEFT)+cache.line_number_w);
- col+=cursor.x_ofs;
- col=get_char_pos_for( col, get_line(row) );
- }
-
- r_row=row;
- r_col=col;
- return true;
+
+ int row=p_mouse.y;
+ row-=cache.style_normal->get_margin(MARGIN_TOP);
+ row/=get_row_height();
+
+ if (row<0 || row>=get_visible_rows())
+ return false;
+
+ row+=cursor.line_ofs;
+ int col=0;
+
+ if (row>=text.size()) {
+
+ row=text.size()-1;
+ col=text[row].size();
+ } else {
+
+ col=p_mouse.x-(cache.style_normal->get_margin(MARGIN_LEFT)+cache.line_number_w);
+ col+=cursor.x_ofs;
+ col=get_char_pos_for( col, get_line(row) );
+ }
+
+ r_row=row;
+ r_col=col;
+ return true;
}
void TextEdit::_input_event(const InputEvent& p_input_event) {
-
- switch(p_input_event.type) {
-
- case InputEvent::MOUSE_BUTTON: {
-
- const InputEventMouseButton &mb=p_input_event.mouse_button;
-
- if (completion_active && completion_rect.has_point(Point2(mb.x,mb.y))) {
-
- if (!mb.pressed)
- return;
-
- if (mb.button_index==BUTTON_WHEEL_UP) {
- if (completion_index>0) {
- completion_index--;
- completion_current=completion_options[completion_index];
- update();
- }
-
- }
- if (mb.button_index==BUTTON_WHEEL_DOWN) {
-
- if (completion_index<completion_options.size()-1) {
- completion_index++;
- completion_current=completion_options[completion_index];
- update();
- }
- }
-
- if (mb.button_index==BUTTON_LEFT) {
-
- completion_index=CLAMP(completion_line_ofs+(mb.y-completion_rect.pos.y)/get_row_height(),0,completion_options.size()-1);
-
- completion_current=completion_options[completion_index];
- update();
- if (mb.doubleclick)
- _confirm_completion();
- }
- return;
- } else {
- _cancel_completion();
- }
-
- if (mb.pressed) {
- if (mb.button_index==BUTTON_WHEEL_UP) {
- v_scroll->set_val( v_scroll->get_val() -3 );
- }
- if (mb.button_index==BUTTON_WHEEL_DOWN) {
- v_scroll->set_val( v_scroll->get_val() +3 );
- }
- if (mb.button_index==BUTTON_LEFT) {
-
- int row,col;
- if (!_get_mouse_pos(Point2i(mb.x,mb.y), row,col))
- return;
-
- int prev_col=cursor.column;
- int prev_line=cursor.line;
-
-
-
- cursor_set_line( row );
- cursor_set_column( col );
-
- if (mb.mod.shift && (cursor.column!=prev_col || cursor.line!=prev_line)) {
-
- selection.active=true;
- selection.selecting_mode=Selection::MODE_POINTER;
- selection.from_column=prev_col;
- selection.from_line=prev_line;
- selection.to_column=cursor.column;
- selection.to_line=cursor.line;
- if (selection.from_column>selection.to_column) {
- SWAP(selection.from_column,selection.to_column);
- SWAP(selection.from_line,selection.to_line);
- }
- selection.selecting_line=prev_line;
- selection.selecting_column=prev_col;
- update();
-
- } else {
-
- //if sel active and dblick last time < something
-
- //else
- selection.active=false;
- selection.selecting_mode=Selection::MODE_POINTER;
- selection.selecting_line=row;
- selection.selecting_column=col;
- }
-
-
- if (!mb.doubleclick && (OS::get_singleton()->get_ticks_msec()-last_dblclk)<600) {
- //tripleclick select line
- select(cursor.line,0,cursor.line,text[cursor.line].length());
- last_dblclk=0;
-
- } else if (mb.doubleclick && text[cursor.line].length()) {
-
- //doubleclick select world
- String s = text[cursor.line];
- int beg=CLAMP(cursor.column,0,s.length());
- int end=beg;
-
- if (s[beg]>32 || beg==s.length()) {
-
- bool symbol = beg < s.length() && _is_symbol(s[beg]); //not sure if right but most editors behave like this
-
- while(beg>0 && s[beg-1]>32 && (symbol==_is_symbol(s[beg-1]))) {
- beg--;
- }
- while(end<s.length() && s[end+1]>32 && (symbol==_is_symbol(s[end+1]))) {
- end++;
- }
-
- if (end<s.length())
- end+=1;
-
- select(cursor.line,beg,cursor.line,end);
- }
-
- last_dblclk = OS::get_singleton()->get_ticks_msec();
-
- }
-
- update();
- }
- } else {
-
- selection.selecting_mode=Selection::MODE_NONE;
- // notify to show soft keyboard
- notification(NOTIFICATION_FOCUS_ENTER);
- }
-
- } break;
- case InputEvent::MOUSE_MOTION: {
-
- const InputEventMouseMotion &mm=p_input_event.mouse_motion;
-
- if (mm.button_mask&BUTTON_MASK_LEFT) {
-
- int row,col;
- if (!_get_mouse_pos(Point2i(mm.x,mm.y), row,col))
- return;
-
- if (selection.selecting_mode==Selection::MODE_POINTER) {
-
- select(selection.selecting_line,selection.selecting_column,row,col);
-
- cursor_set_line( row );
- cursor_set_column( col );
- update();
-
- }
-
- }
-
- } break;
-
- case InputEvent::KEY: {
-
- InputEventKey k=p_input_event.key;
-
- if (!k.pressed)
- return;
-
- if (completion_active) {
-
- bool valid=true;
- if (k.mod.command || k.mod.alt || k.mod.meta)
- valid=false;
-
- if (valid) {
-
- if (k.scancode==KEY_UP) {
-
- if (completion_index>0) {
- completion_index--;
- completion_current=completion_options[completion_index];
- update();
- }
- accept_event();
- return;
- }
-
-
- if (k.scancode==KEY_DOWN) {
-
- if (completion_index<completion_options.size()-1) {
- completion_index++;
- completion_current=completion_options[completion_index];
- update();
- }
- accept_event();
- return;
- }
-
- if (k.scancode==KEY_PAGEUP) {
-
- completion_index-=get_constant("completion_lines");
- if (completion_index<0)
- completion_index=0;
- completion_current=completion_options[completion_index];
- update();
- accept_event();
- return;
- }
-
-
- if (k.scancode==KEY_PAGEDOWN) {
-
- completion_index+=get_constant("completion_lines");
- if (completion_index>=completion_options.size())
- completion_index=completion_options.size()-1;
- completion_current=completion_options[completion_index];
- update();
- accept_event();
- return;
- }
-
- if (k.scancode==KEY_HOME) {
-
- completion_index=0;
- completion_current=completion_options[completion_index];
- update();
- accept_event();
- return;
- }
-
- if (k.scancode==KEY_END) {
-
- completion_index=completion_options.size()-1;
- completion_current=completion_options[completion_index];
- update();
- accept_event();
- return;
- }
-
-
- if (k.scancode==KEY_DOWN) {
-
- if (completion_index<completion_options.size()-1) {
- completion_index++;
- completion_current=completion_options[completion_index];
- update();
- }
- accept_event();
- return;
- }
-
- if (k.scancode==KEY_RETURN || k.scancode==KEY_TAB) {
-
- _confirm_completion();
- accept_event();
- return;
- }
-
- if (k.scancode==KEY_BACKSPACE) {
-
- backspace_at_cursor();
- _update_completion_candidates();
- accept_event();
- return;
- }
-
-
- if (k.scancode==KEY_SHIFT) {
- accept_event();
- return;
- }
-
- if (k.unicode>32) {
-
- if (cursor.column<text[cursor.line].length() && text[cursor.line][cursor.column]==k.unicode) {
- //same char, move ahead
- cursor_set_column(cursor.column+1);
-
- } else {
- //different char, go back
- const CharType chr[2] = {k.unicode, 0};
- if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) {
- _consume_pair_symbol(chr[0]);
- } else {
- _insert_text_at_cursor(chr);
- }
- }
-
- _update_completion_candidates();
- accept_event();
-
- return;
- }
- }
-
- _cancel_completion();
- }
-
- /* TEST CONTROL FIRST!! */
-
- // some remaps for duplicate functions..
- if (k.mod.command && !k.mod.shift && !k.mod.alt && !k.mod.meta && k.scancode==KEY_INSERT) {
-
- k.scancode=KEY_C;
- }
- if (!k.mod.command && k.mod.shift && !k.mod.alt && !k.mod.meta && k.scancode==KEY_INSERT) {
-
- k.scancode=KEY_V;
- k.mod.command=true;
- k.mod.shift=false;
- }
-
- // stuff to do when selection is active..
-
- if (selection.active) {
-
- bool clear=false;
- bool unselect=false;
- bool dobreak=false;
-
- switch(k.scancode) {
-
- case KEY_TAB: {
-
- String txt = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- String prev_txt=txt;
-
- if (k.mod.shift) {
-
- for(int i=0;i<txt.length();i++) {
- if (((i>0 && txt[i-1]=='\n') || (i==0 /*&& selection.from_column==0*/)) && (txt[i]=='\t' || txt[i]==' ')) {
- txt.remove(i);
- //i--;
- }
- }
- } else {
-
- for(int i=0;i<txt.length();i++) {
-
- if (((i>0 && txt[i-1]=='\n') || (i==0 /*&& selection.from_column==0*/))) {
- txt=txt.insert(i,"\t");
- //i--;
- }
- }
- }
-
- if (txt!=prev_txt) {
-
- int sel_line=selection.from_line;
- int sel_column=selection.from_column;
-
- cursor_set_line(selection.from_line);
- cursor_set_column(selection.from_column);
- _begin_compex_operation();
- _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- _insert_text_at_cursor(txt);
- _end_compex_operation();
- selection.active=true;
- selection.from_column=sel_column;
- selection.from_line=sel_line;
- selection.to_column=cursor.column;
- selection.to_line=cursor.line;
- update();
- }
-
- dobreak=true;
- accept_event();
-
- } break;
- case KEY_X:
- case KEY_C:
- //special keys often used with control, wait...
- clear=(!k.mod.command || k.mod.shift || k.mod.alt );
- break;
- case KEY_DELETE:
- case KEY_BACKSPACE:
- accept_event();
- clear=true; dobreak=true;
- break;
- case KEY_LEFT:
- case KEY_RIGHT:
- case KEY_UP:
- case KEY_DOWN:
- case KEY_PAGEUP:
- case KEY_PAGEDOWN:
- case KEY_HOME:
- case KEY_END:
- // ignore arrows if any modifiers are held (shift = selecting, others may be used for editor hotkeys)
- if (k.mod.command || k.mod.shift || k.mod.alt || k.mod.command)
- break;
- unselect=true;
- break;
- default:
- if (k.unicode>=32 && !k.mod.command && !k.mod.alt && !k.mod.meta)
- clear=true;
- if (auto_brace_completion_enabled && _is_pair_left_symbol(k.unicode))
- clear=false;
- }
-
- if (unselect) {
- selection.active=false;
- selection.selecting_mode=Selection::MODE_NONE;
- update();
- }
- if (clear) {
-
- selection.active=false;
- update();
- _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- cursor_set_line(selection.from_line);
- cursor_set_column(selection.from_column);
- update();
- }
- if (dobreak)
- break;
- }
-
- selection.selecting_test=false;
-
- bool scancode_handled=true;
-
- // special scancode test...
-
- switch (k.scancode) {
-
- case KEY_ENTER:
- case KEY_RETURN: {
-
- String ins="\n";
-
- //keep indentation
- for(int i=0;i<text[cursor.line].length();i++) {
- if (text[cursor.line][i]=='\t')
- ins+="\t";
- else
- break;
- }
-
- _insert_text_at_cursor(ins);
- _push_current_op();
-
- } break;
- case KEY_TAB: {
-
- if (readonly)
- break;
-
- if (selection.active) {
-
-
- } else {
- if (k.mod.shift) {
-
- int cc = cursor.column;
- if (cc>0 && cc<=text[cursor.line].length() && text[cursor.line][cursor.column-1]=='\t') {
- //simple unindent
-
- backspace_at_cursor();
- }
- } else {
- //simple indent
- _insert_text_at_cursor("\t");
- }
- }
-
- } break;
- case KEY_BACKSPACE: {
- if (readonly)
- break;
- backspace_at_cursor();
-
- } break;
- case KEY_LEFT: {
-
- if (k.mod.shift)
- _pre_shift_selection();
-
+
+ switch(p_input_event.type) {
+
+ case InputEvent::MOUSE_BUTTON: {
+
+ const InputEventMouseButton &mb=p_input_event.mouse_button;
+
+ if (completion_active && completion_rect.has_point(Point2(mb.x,mb.y))) {
+
+ if (!mb.pressed)
+ return;
+
+ if (mb.button_index==BUTTON_WHEEL_UP) {
+ if (completion_index>0) {
+ completion_index--;
+ completion_current=completion_options[completion_index];
+ update();
+ }
+
+ }
+ if (mb.button_index==BUTTON_WHEEL_DOWN) {
+
+ if (completion_index<completion_options.size()-1) {
+ completion_index++;
+ completion_current=completion_options[completion_index];
+ update();
+ }
+ }
+
+ if (mb.button_index==BUTTON_LEFT) {
+
+ completion_index=CLAMP(completion_line_ofs+(mb.y-completion_rect.pos.y)/get_row_height(),0,completion_options.size()-1);
+
+ completion_current=completion_options[completion_index];
+ update();
+ if (mb.doubleclick)
+ _confirm_completion();
+ }
+ return;
+ } else {
+ _cancel_completion();
+ _cancel_code_hint();
+ }
+
+ if (mb.pressed) {
+ if (mb.button_index==BUTTON_WHEEL_UP) {
+ v_scroll->set_val( v_scroll->get_val() -3 );
+ }
+ if (mb.button_index==BUTTON_WHEEL_DOWN) {
+ v_scroll->set_val( v_scroll->get_val() +3 );
+ }
+ if (mb.button_index==BUTTON_LEFT) {
+
+ int row,col;
+ if (!_get_mouse_pos(Point2i(mb.x,mb.y), row,col))
+ return;
+
+ int prev_col=cursor.column;
+ int prev_line=cursor.line;
+
+
+
+ cursor_set_line( row );
+ cursor_set_column( col );
+
+ if (mb.mod.shift && (cursor.column!=prev_col || cursor.line!=prev_line)) {
+
+ if (!selection.active) {
+ selection.active=true;
+ selection.selecting_mode=Selection::MODE_POINTER;
+ selection.from_column=prev_col;
+ selection.from_line=prev_line;
+ selection.to_column=cursor.column;
+ selection.to_line=cursor.line;
+
+ if (selection.from_line>selection.to_line || (selection.from_line==selection.to_line && selection.from_column>selection.to_column)) {
+ SWAP(selection.from_column,selection.to_column);
+ SWAP(selection.from_line,selection.to_line);
+ selection.shiftclick_left=false;
+ } else {
+ selection.shiftclick_left=true;
+ }
+ selection.selecting_line=prev_line;
+ selection.selecting_column=prev_col;
+ update();
+ } else {
+
+ if (cursor.line<selection.from_line || (cursor.line==selection.from_line && cursor.column<=selection.from_column)) {
+ selection.from_column=cursor.column;
+ selection.from_line=cursor.line;
+ } else if (cursor.line>selection.to_line || (cursor.line==selection.to_line && cursor.column>=selection.to_column)) {
+ selection.to_column=cursor.column;
+ selection.to_line=cursor.line;
+
+ } else if (!selection.shiftclick_left) {
+
+ selection.from_column=cursor.column;
+ selection.from_line=cursor.line;
+ } else {
+
+ selection.to_column=cursor.column;
+ selection.to_line=cursor.line;
+ }
+
+ if (selection.from_line>selection.to_line || (selection.from_line==selection.to_line && selection.from_column>selection.to_column)) {
+ SWAP(selection.from_column,selection.to_column);
+ SWAP(selection.from_line,selection.to_line);
+ }
+ update();
+ }
+
+
+
+
+
+
+
+ } else {
+
+ //if sel active and dblick last time < something
+
+ //else
+ selection.active=false;
+ selection.selecting_mode=Selection::MODE_POINTER;
+ selection.selecting_line=row;
+ selection.selecting_column=col;
+ }
+
+
+ if (!mb.doubleclick && (OS::get_singleton()->get_ticks_msec()-last_dblclk)<600) {
+ //tripleclick select line
+ select(cursor.line,0,cursor.line,text[cursor.line].length());
+ last_dblclk=0;
+
+ } else if (mb.doubleclick && text[cursor.line].length()) {
+
+ //doubleclick select world
+ String s = text[cursor.line];
+ int beg=CLAMP(cursor.column,0,s.length());
+ int end=beg;
+
+ if (s[beg]>32 || beg==s.length()) {
+
+ bool symbol = beg < s.length() && _is_symbol(s[beg]); //not sure if right but most editors behave like this
+
+ while(beg>0 && s[beg-1]>32 && (symbol==_is_symbol(s[beg-1]))) {
+ beg--;
+ }
+ while(end<s.length() && s[end+1]>32 && (symbol==_is_symbol(s[end+1]))) {
+ end++;
+ }
+
+ if (end<s.length())
+ end+=1;
+
+ select(cursor.line,beg,cursor.line,end);
+ }
+
+ last_dblclk = OS::get_singleton()->get_ticks_msec();
+
+ }
+
+ update();
+ }
+ } else {
+
+ selection.selecting_mode=Selection::MODE_NONE;
+ // notify to show soft keyboard
+ notification(NOTIFICATION_FOCUS_ENTER);
+ }
+
+ } break;
+ case InputEvent::MOUSE_MOTION: {
+
+ const InputEventMouseMotion &mm=p_input_event.mouse_motion;
+
+ if (mm.button_mask&BUTTON_MASK_LEFT) {
+
+ int row,col;
+ if (!_get_mouse_pos(Point2i(mm.x,mm.y), row,col))
+ return;
+
+ if (selection.selecting_mode==Selection::MODE_POINTER) {
+
+ select(selection.selecting_line,selection.selecting_column,row,col);
+
+ cursor_set_line( row );
+ cursor_set_column( col );
+ update();
+
+ }
+
+ }
+
+ } break;
+
+ case InputEvent::KEY: {
+
+ InputEventKey k=p_input_event.key;
+
+ if (!k.pressed)
+ return;
+
+ if (completion_active) {
+ if (readonly)
+ break;
+
+ bool valid=true;
+ if (k.mod.command || k.mod.meta)
+ valid=false;
+
+ if (valid) {
+
+ if (!k.mod.alt) {
+ if (k.scancode==KEY_UP) {
+
+ if (completion_index>0) {
+ completion_index--;
+ completion_current=completion_options[completion_index];
+ update();
+ }
+ accept_event();
+ return;
+ }
+
+
+ if (k.scancode==KEY_DOWN) {
+
+ if (completion_index<completion_options.size()-1) {
+ completion_index++;
+ completion_current=completion_options[completion_index];
+ update();
+ }
+ accept_event();
+ return;
+ }
+
+ if (k.scancode==KEY_PAGEUP) {
+
+ completion_index-=get_constant("completion_lines");
+ if (completion_index<0)
+ completion_index=0;
+ completion_current=completion_options[completion_index];
+ update();
+ accept_event();
+ return;
+ }
+
+
+ if (k.scancode==KEY_PAGEDOWN) {
+
+ completion_index+=get_constant("completion_lines");
+ if (completion_index>=completion_options.size())
+ completion_index=completion_options.size()-1;
+ completion_current=completion_options[completion_index];
+ update();
+ accept_event();
+ return;
+ }
+
+ if (k.scancode==KEY_HOME) {
+
+ completion_index=0;
+ completion_current=completion_options[completion_index];
+ update();
+ accept_event();
+ return;
+ }
+
+ if (k.scancode==KEY_END) {
+
+ completion_index=completion_options.size()-1;
+ completion_current=completion_options[completion_index];
+ update();
+ accept_event();
+ return;
+ }
+
+
+ if (k.scancode==KEY_DOWN) {
+
+ if (completion_index<completion_options.size()-1) {
+ completion_index++;
+ completion_current=completion_options[completion_index];
+ update();
+ }
+ accept_event();
+ return;
+ }
+
+ if (k.scancode==KEY_RETURN || k.scancode==KEY_TAB) {
+
+ _confirm_completion();
+ accept_event();
+ return;
+ }
+
+ if (k.scancode==KEY_BACKSPACE) {
+
+ backspace_at_cursor();
+ _update_completion_candidates();
+ accept_event();
+ return;
+ }
+
+
+ if (k.scancode==KEY_SHIFT) {
+ accept_event();
+ return;
+ }
+ }
+
+ if (k.unicode>32) {
+
+ if (cursor.column<text[cursor.line].length() && text[cursor.line][cursor.column]==k.unicode) {
+ //same char, move ahead
+ cursor_set_column(cursor.column+1);
+
+ } else {
+ //different char, go back
+ const CharType chr[2] = {k.unicode, 0};
+ if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) {
+ _consume_pair_symbol(chr[0]);
+ } else {
+ _insert_text_at_cursor(chr);
+ }
+ }
+
+ _update_completion_candidates();
+ accept_event();
+
+ return;
+ }
+ }
+
+ _cancel_completion();
+
+ }
+
+ /* TEST CONTROL FIRST!! */
+
+ // some remaps for duplicate functions..
+ if (k.mod.command && !k.mod.shift && !k.mod.alt && !k.mod.meta && k.scancode==KEY_INSERT) {
+
+ k.scancode=KEY_C;
+ }
+ if (!k.mod.command && k.mod.shift && !k.mod.alt && !k.mod.meta && k.scancode==KEY_INSERT) {
+
+ k.scancode=KEY_V;
+ k.mod.command=true;
+ k.mod.shift=false;
+ }
+
+ // stuff to do when selection is active..
+
+ if (selection.active) {
+
+ if (readonly)
+ break;
+
+ bool clear=false;
+ bool unselect=false;
+ bool dobreak=false;
+
+ switch(k.scancode) {
+
+ case KEY_TAB: {
+
+ String txt = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ String prev_txt=txt;
+
+ if (k.mod.shift) {
+
+ for(int i=0;i<txt.length();i++) {
+ if (((i>0 && txt[i-1]=='\n') || (i==0 /*&& selection.from_column==0*/)) && (txt[i]=='\t' || txt[i]==' ')) {
+ txt.remove(i);
+ //i--;
+ }
+ }
+ } else {
+
+ for(int i=0;i<txt.length();i++) {
+
+ if (((i>0 && txt[i-1]=='\n') || (i==0 /*&& selection.from_column==0*/))) {
+ txt=txt.insert(i,"\t");
+ //i--;
+ }
+ }
+ }
+
+ if (txt!=prev_txt) {
+
+ int sel_line=selection.from_line;
+ int sel_column=selection.from_column;
+
+ cursor_set_line(selection.from_line);
+ cursor_set_column(selection.from_column);
+ _begin_compex_operation();
+ _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ _insert_text_at_cursor(txt);
+ _end_compex_operation();
+ selection.active=true;
+ selection.from_column=sel_column;
+ selection.from_line=sel_line;
+ selection.to_column=cursor.column;
+ selection.to_line=cursor.line;
+ update();
+ }
+
+ dobreak=true;
+ accept_event();
+
+ } break;
+ case KEY_X:
+ case KEY_C:
+ //special keys often used with control, wait...
+ clear=(!k.mod.command || k.mod.shift || k.mod.alt );
+ break;
+ case KEY_DELETE:
+ case KEY_BACKSPACE:
+ accept_event();
+ clear=true; dobreak=true;
+ break;
+ case KEY_LEFT:
+ case KEY_RIGHT:
+ case KEY_UP:
+ case KEY_DOWN:
+ case KEY_PAGEUP:
+ case KEY_PAGEDOWN:
+ case KEY_HOME:
+ case KEY_END:
+ // ignore arrows if any modifiers are held (shift = selecting, others may be used for editor hotkeys)
+ if (k.mod.command || k.mod.shift || k.mod.alt || k.mod.command)
+ break;
+ unselect=true;
+ break;
+
+ default:
+ if (k.unicode>=32 && !k.mod.command && !k.mod.alt && !k.mod.meta)
+ clear=true;
+ if (auto_brace_completion_enabled && _is_pair_left_symbol(k.unicode))
+ clear=false;
+ }
+
+ if (unselect) {
+ selection.active=false;
+ selection.selecting_mode=Selection::MODE_NONE;
+ update();
+ }
+ if (clear) {
+
+ selection.active=false;
+ update();
+ _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ cursor_set_line(selection.from_line);
+ cursor_set_column(selection.from_column);
+ update();
+ }
+ if (dobreak)
+ break;
+ }
+
+ selection.selecting_test=false;
+
+ bool scancode_handled=true;
+
+ // special scancode test...
+
+ switch (k.scancode) {
+
+ case KEY_ENTER:
+ case KEY_RETURN: {
+
+ if (readonly)
+ break;
+
+ String ins="\n";
+
+ //keep indentation
+ for(int i=0;i<text[cursor.line].length();i++) {
+ if (text[cursor.line][i]=='\t')
+ ins+="\t";
+ else
+ break;
+ }
+
+ _insert_text_at_cursor(ins);
+ _push_current_op();
+
+ } break;
+ case KEY_ESCAPE: {
+ if (completion_hint!="") {
+ completion_hint="";
+ update();
+
+ }
+ } break;
+ case KEY_TAB: {
+
+ if (readonly)
+ break;
+
+ if (selection.active) {
+
+
+ } else {
+ if (k.mod.shift) {
+
+ int cc = cursor.column;
+ if (cc>0 && cc<=text[cursor.line].length() && text[cursor.line][cursor.column-1]=='\t') {
+ //simple unindent
+
+ backspace_at_cursor();
+ }
+ } else {
+ //simple indent
+ _insert_text_at_cursor("\t");
+ }
+ }
+
+ } break;
+ case KEY_BACKSPACE: {
+ if (readonly)
+ break;
+ backspace_at_cursor();
+
+ } break;
+ case KEY_LEFT: {
+
+ if (k.mod.shift)
+ _pre_shift_selection();
+
#ifdef APPLE_STYLE_KEYS
- if (k.mod.command) {
- cursor_set_column(0);
- } else if (k.mod.alt) {
-
+ if (k.mod.command) {
+ cursor_set_column(0);
+ } else if (k.mod.alt) {
+
#else
- if (k.mod.alt) {
- scancode_handled=false;
- break;
- } else if (k.mod.command) {
+ if (k.mod.alt) {
+ scancode_handled=false;
+ break;
+ } else if (k.mod.command) {
#endif
- bool prev_char=false;
- int cc=cursor.column;
- while (cc>0) {
-
- bool ischar=_is_text_char(text[cursor.line][cc-1]);
-
- if (prev_char && !ischar)
- break;
-
- prev_char=ischar;
- cc--;
-
- }
-
- cursor_set_column(cc);
-
- } else if (cursor.column==0) {
-
- if (cursor.line>0) {
- cursor_set_line(cursor.line-1);
- cursor_set_column(text[cursor.line].length());
- }
- } else {
- cursor_set_column(cursor_get_column()-1);
- }
-
- if (k.mod.shift)
- _post_shift_selection();
-
- } break;
- case KEY_RIGHT: {
-
- if (k.mod.shift)
- _pre_shift_selection();
-
+ bool prev_char=false;
+ int cc=cursor.column;
+ while (cc>0) {
+
+ bool ischar=_is_text_char(text[cursor.line][cc-1]);
+
+ if (prev_char && !ischar)
+ break;
+
+ prev_char=ischar;
+ cc--;
+
+ }
+
+ cursor_set_column(cc);
+
+ } else if (cursor.column==0) {
+
+ if (cursor.line>0) {
+ cursor_set_line(cursor.line-1);
+ cursor_set_column(text[cursor.line].length());
+ }
+ } else {
+ cursor_set_column(cursor_get_column()-1);
+ }
+
+ if (k.mod.shift)
+ _post_shift_selection();
+
+ } break;
+ case KEY_RIGHT: {
+
+ if (k.mod.shift)
+ _pre_shift_selection();
+
#ifdef APPLE_STYLE_KEYS
- if (k.mod.command) {
- cursor_set_column(text[cursor.line].length());
- } else if (k.mod.alt) {
+ if (k.mod.command) {
+ cursor_set_column(text[cursor.line].length());
+ } else if (k.mod.alt) {
#else
- if (k.mod.alt) {
- scancode_handled=false;
- break;
- } else if (k.mod.command) {
+ if (k.mod.alt) {
+ scancode_handled=false;
+ break;
+ } else if (k.mod.command) {
#endif
- bool prev_char=false;
- int cc=cursor.column;
- while (cc<text[cursor.line].length()) {
-
- bool ischar=_is_text_char(text[cursor.line][cc]);
-
- if (prev_char && !ischar)
- break;
- prev_char=ischar;
- cc++;
- }
-
- cursor_set_column(cc);
-
- } else if (cursor.column==text[cursor.line].length()) {
-
- if (cursor.line<text.size()-1) {
- cursor_set_line(cursor.line+1);
- cursor_set_column(0);
- }
- } else {
- cursor_set_column(cursor_get_column()+1);
- }
-
- if (k.mod.shift)
- _post_shift_selection();
-
- } break;
- case KEY_UP: {
-
- if (k.mod.shift)
- _pre_shift_selection();
- if (k.mod.alt) {
- scancode_handled=false;
- break;
- }
+ bool prev_char=false;
+ int cc=cursor.column;
+ while (cc<text[cursor.line].length()) {
+
+ bool ischar=_is_text_char(text[cursor.line][cc]);
+
+ if (prev_char && !ischar)
+ break;
+ prev_char=ischar;
+ cc++;
+ }
+
+ cursor_set_column(cc);
+
+ } else if (cursor.column==text[cursor.line].length()) {
+
+ if (cursor.line<text.size()-1) {
+ cursor_set_line(cursor.line+1);
+ cursor_set_column(0);
+ }
+ } else {
+ cursor_set_column(cursor_get_column()+1);
+ }
+
+ if (k.mod.shift)
+ _post_shift_selection();
+
+ } break;
+ case KEY_UP: {
+
+ if (k.mod.shift)
+ _pre_shift_selection();
+ if (k.mod.alt) {
+ scancode_handled=false;
+ break;
+ }
#ifdef APPLE_STYLE_KEYS
- if (k.mod.command)
- cursor_set_line(0);
- else
+ if (k.mod.command)
+ cursor_set_line(0);
+ else
#endif
- cursor_set_line(cursor_get_line()-1);
-
- if (k.mod.shift)
- _post_shift_selection();
-
- } break;
- case KEY_DOWN: {
-
- if (k.mod.shift)
- _pre_shift_selection();
- if (k.mod.alt) {
- scancode_handled=false;
- break;
- }
+ cursor_set_line(cursor_get_line()-1);
+
+ if (k.mod.shift)
+ _post_shift_selection();
+ _cancel_code_hint();
+
+ } break;
+ case KEY_DOWN: {
+
+ if (k.mod.shift)
+ _pre_shift_selection();
+ if (k.mod.alt) {
+ scancode_handled=false;
+ break;
+ }
#ifdef APPLE_STYLE_KEYS
- if (k.mod.command)
- cursor_set_line(text.size()-1);
- else
+ if (k.mod.command)
+ cursor_set_line(text.size()-1);
+ else
#endif
- cursor_set_line(cursor_get_line()+1);
-
- if (k.mod.shift)
- _post_shift_selection();
-
- } break;
-
- case KEY_DELETE: {
-
- if (readonly)
- break;
- int curline_len = text[cursor.line].length();
-
- if (cursor.line==text.size()-1 && cursor.column==curline_len)
- break; //nothing to do
-
- int next_line = cursor.column<curline_len?cursor.line:cursor.line+1;
- int next_column = cursor.column<curline_len?(cursor.column+1):0;
- _remove_text(cursor.line,cursor.column,next_line,next_column);
- update();
- } break;
+ cursor_set_line(cursor_get_line()+1);
+
+ if (k.mod.shift)
+ _post_shift_selection();
+ _cancel_code_hint();
+
+ } break;
+
+ case KEY_DELETE: {
+
+ if (readonly)
+ break;
+ int curline_len = text[cursor.line].length();
+
+ if (cursor.line==text.size()-1 && cursor.column==curline_len)
+ break; //nothing to do
+
+ int next_line = cursor.column<curline_len?cursor.line:cursor.line+1;
+ int next_column = cursor.column<curline_len?(cursor.column+1):0;
+ _remove_text(cursor.line,cursor.column,next_line,next_column);
+ update();
+ } break;
#ifdef APPLE_STYLE_KEYS
- case KEY_HOME: {
-
-
- if (k.mod.shift)
- _pre_shift_selection();
-
- cursor_set_line(0);
-
- if (k.mod.shift)
- _post_shift_selection();
-
- } break;
- case KEY_END: {
-
- if (k.mod.shift)
- _pre_shift_selection();
-
- cursor_set_line(text.size()-1);
-
- if (k.mod.shift)
- _post_shift_selection();
-
- } break;
-
+ case KEY_HOME: {
+
+
+ if (k.mod.shift)
+ _pre_shift_selection();
+
+ cursor_set_line(0);
+
+ if (k.mod.shift)
+ _post_shift_selection();
+
+ } break;
+ case KEY_END: {
+
+ if (k.mod.shift)
+ _pre_shift_selection();
+
+ cursor_set_line(text.size()-1);
+
+ if (k.mod.shift)
+ _post_shift_selection();
+
+ } break;
+
#else
- case KEY_HOME: {
-
-
- if (k.mod.shift)
- _pre_shift_selection();
-
- // compute whitespace symbols seq length
- int current_line_whitespace_len = 0;
- while(current_line_whitespace_len < text[cursor.line].length()) {
- CharType c = text[cursor.line][current_line_whitespace_len];
- if(c != '\t' && c != ' ')
- break;
- current_line_whitespace_len++;
- }
-
- if(cursor_get_column() == current_line_whitespace_len)
- cursor_set_column(0);
- else
- cursor_set_column(current_line_whitespace_len);
-
- if (k.mod.command)
- cursor_set_line(0);
-
- if (k.mod.shift)
- _post_shift_selection();
-
- } break;
- case KEY_END: {
-
- if (k.mod.shift)
- _pre_shift_selection();
-
- if (k.mod.command)
- cursor_set_line(text.size()-1);
- cursor_set_column(text[cursor.line].length());
-
- if (k.mod.shift)
- _post_shift_selection();
-
- } break;
+ case KEY_HOME: {
+
+
+ if (k.mod.shift)
+ _pre_shift_selection();
+
+ // compute whitespace symbols seq length
+ int current_line_whitespace_len = 0;
+ while(current_line_whitespace_len < text[cursor.line].length()) {
+ CharType c = text[cursor.line][current_line_whitespace_len];
+ if(c != '\t' && c != ' ')
+ break;
+ current_line_whitespace_len++;
+ }
+
+ if(cursor_get_column() == current_line_whitespace_len)
+ cursor_set_column(0);
+ else
+ cursor_set_column(current_line_whitespace_len);
+
+ if (k.mod.command)
+ cursor_set_line(0);
+
+ if (k.mod.shift)
+ _post_shift_selection();
+
+ } break;
+ case KEY_END: {
+
+ if (k.mod.shift)
+ _pre_shift_selection();
+
+ if (k.mod.command)
+ cursor_set_line(text.size()-1);
+ cursor_set_column(text[cursor.line].length());
+
+ if (k.mod.shift)
+ _post_shift_selection();
+
+ } break;
#endif
- case KEY_PAGEUP: {
-
- if (k.mod.shift)
- _pre_shift_selection();
-
- cursor_set_line(cursor_get_line()-get_visible_rows());
-
- if (k.mod.shift)
- _post_shift_selection();
-
- } break;
- case KEY_PAGEDOWN: {
-
- if (k.mod.shift)
- _pre_shift_selection();
-
- cursor_set_line(cursor_get_line()+get_visible_rows());
-
- if (k.mod.shift)
- _post_shift_selection();
-
- } break;
- case KEY_A: {
-
- if (!k.mod.command || k.mod.shift || k.mod.alt) {
- scancode_handled=false;
- break;
- }
-
- if (text.size()==1 && text[0].length()==0)
- break;
- selection.active=true;
- selection.from_line=0;
- selection.from_column=0;
- selection.to_line=text.size()-1;
- selection.to_column=text[selection.to_line].size();
- selection.selecting_mode=Selection::MODE_NONE;
- update();
-
- } break;
- case KEY_X: {
-
- if (!k.mod.command || k.mod.shift || k.mod.alt) {
- scancode_handled=false;
- break;
- }
-
- if (!selection.active){
-
- String clipboard = text[cursor.line];
- OS::get_singleton()->set_clipboard(clipboard);
- cursor_set_line(cursor.line);
- cursor_set_column(0);
- _remove_text(cursor.line,0,cursor.line,text[cursor.line].length());
-
- backspace_at_cursor();
- update();
- cursor_set_line(cursor.line+1);
- cut_copy_line = true;
-
- }
- else
- {
-
- String clipboard = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- OS::get_singleton()->set_clipboard(clipboard);
-
- cursor_set_line(selection.from_line);
- cursor_set_column(selection.from_column);
-
- _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- selection.active=false;
- selection.selecting_mode=Selection::MODE_NONE;
- update();
- cut_copy_line = false;
- }
-
- } break;
- case KEY_C: {
-
- if (!k.mod.command || k.mod.shift || k.mod.alt) {
- scancode_handled=false;
- break;
- }
-
- if (!selection.active){
- String clipboard = _base_get_text(cursor.line,0,cursor.line,text[cursor.line].length());
- OS::get_singleton()->set_clipboard(clipboard);
- cut_copy_line = true;
- }
- else{
- String clipboard = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- OS::get_singleton()->set_clipboard(clipboard);
- cut_copy_line = false;
- }
- } break;
- case KEY_Z: {
-
- if (!k.mod.command) {
- scancode_handled=false;
- break;
- }
-
- if (k.mod.shift)
- redo();
- else
- undo();
- } break;
- case KEY_V: {
-
- if (!k.mod.command || k.mod.shift || k.mod.alt) {
- scancode_handled=false;
- break;
- }
-
- String clipboard = OS::get_singleton()->get_clipboard();
-
- if (selection.active) {
- selection.active=false;
- _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- cursor_set_line(selection.from_line);
- cursor_set_column(selection.from_column);
-
- }
- else if (cut_copy_line)
- {
- cursor_set_column(0);
- String ins="\n";
- clipboard += ins;
- }
-
- _insert_text_at_cursor(clipboard);
-
- update();
- } break;
- case KEY_SPACE: {
- if (completion_enabled && k.mod.command) {
-
- query_code_comple();
- scancode_handled=true;
- } else {
- scancode_handled=false;
- }
-
- } break;
-
- case KEY_K:{
- if (!k.mod.command || k.mod.shift || k.mod.alt) {
- scancode_handled=false;
- break;
- }
- else {
- if (selection.active) {
- int ini = selection.from_line;
- int end = selection.to_line;
- for (int i=ini; i<= end; i++)
- {
- _insert_text(i,0,"#");
- }
- }
- else{
- _insert_text(cursor.line,0,"#");
- }
- update();
- }
- break;}
-
- case KEY_U:{
- if (!k.mod.command || k.mod.shift || k.mod.alt) {
- scancode_handled=false;
- break;
- }
- else {
- if (selection.active) {
- int ini = selection.from_line;
- int end = selection.to_line;
- for (int i=ini; i<= end; i++)
- {
- if (text[i][0] == '#')
- _remove_text(i,0,i,1);
- }
- }
- else{
- if (text[cursor.line][0] == '#')
- _remove_text(cursor.line,0,cursor.line,1);
- }
- update();
- }
- break;}
-
- default: {
-
- scancode_handled=false;
- } break;
-
- }
-
- if (scancode_handled)
- accept_event();
-/*
- if (!scancode_handled && !k.mod.command && !k.mod.alt) {
-
- if (k.unicode>=32) {
-
- if (readonly)
- break;
-
- accept_event();
- } else {
-
- break;
- }
- }
+ case KEY_PAGEUP: {
+
+ if (k.mod.shift)
+ _pre_shift_selection();
+
+ cursor_set_line(cursor_get_line()-get_visible_rows());
+
+ if (k.mod.shift)
+ _post_shift_selection();
+
+ } break;
+ case KEY_PAGEDOWN: {
+
+ if (k.mod.shift)
+ _pre_shift_selection();
+
+ cursor_set_line(cursor_get_line()+get_visible_rows());
+
+ if (k.mod.shift)
+ _post_shift_selection();
+
+ } break;
+ case KEY_A: {
+
+ if (!k.mod.command || k.mod.shift || k.mod.alt) {
+ scancode_handled=false;
+ break;
+ }
+
+ if (text.size()==1 && text[0].length()==0)
+ break;
+ selection.active=true;
+ selection.from_line=0;
+ selection.from_column=0;
+ selection.to_line=text.size()-1;
+ selection.to_column=text[selection.to_line].size();
+ selection.selecting_mode=Selection::MODE_NONE;
+ update();
+
+ } break;
+ case KEY_X: {
+
+ if (!k.mod.command || k.mod.shift || k.mod.alt) {
+ scancode_handled=false;
+ break;
+ }
+
+ if (!selection.active){
+
+ String clipboard = text[cursor.line];
+ OS::get_singleton()->set_clipboard(clipboard);
+ cursor_set_line(cursor.line);
+ cursor_set_column(0);
+ _remove_text(cursor.line,0,cursor.line,text[cursor.line].length());
+
+ backspace_at_cursor();
+ update();
+ cursor_set_line(cursor.line+1);
+ cut_copy_line = true;
+
+ }
+ else
+ {
+
+ String clipboard = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ OS::get_singleton()->set_clipboard(clipboard);
+
+ cursor_set_line(selection.from_line);
+ cursor_set_column(selection.from_column);
+
+ _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ selection.active=false;
+ selection.selecting_mode=Selection::MODE_NONE;
+ update();
+ cut_copy_line = false;
+ }
+
+ } break;
+ case KEY_C: {
+
+ if (!k.mod.command || k.mod.shift || k.mod.alt) {
+ scancode_handled=false;
+ break;
+ }
+
+ if (!selection.active){
+ String clipboard = _base_get_text(cursor.line,0,cursor.line,text[cursor.line].length());
+ OS::get_singleton()->set_clipboard(clipboard);
+ cut_copy_line = true;
+ }
+ else{
+ String clipboard = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ OS::get_singleton()->set_clipboard(clipboard);
+ cut_copy_line = false;
+ }
+ } break;
+ case KEY_Z: {
+
+ if (!k.mod.command) {
+ scancode_handled=false;
+ break;
+ }
+
+ if (k.mod.shift)
+ redo();
+ else
+ undo();
+ } break;
+ case KEY_V: {
+
+ if (!k.mod.command || k.mod.shift || k.mod.alt) {
+ scancode_handled=false;
+ break;
+ }
+
+ String clipboard = OS::get_singleton()->get_clipboard();
+
+ if (selection.active) {
+ selection.active=false;
+ _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ cursor_set_line(selection.from_line);
+ cursor_set_column(selection.from_column);
+
+ }
+ else if (cut_copy_line)
+ {
+ cursor_set_column(0);
+ String ins="\n";
+ clipboard += ins;
+ }
+
+ _insert_text_at_cursor(clipboard);
+
+ update();
+ } break;
+ case KEY_SPACE: {
+#ifdef OSX_ENABLED
+ if (completion_enabled && k.mod.meta) { //cmd-space is spotlight shortcut in OSX
+#else
+ if (completion_enabled && k.mod.command) {
+#endif
+
+ query_code_comple();
+ scancode_handled=true;
+ } else {
+ scancode_handled=false;
+ }
+
+ } break;
+
+ case KEY_U:{
+ if (!k.mod.command || k.mod.shift) {
+ scancode_handled=false;
+ break;
+ }
+ else {
+ if (selection.active) {
+ int ini = selection.from_line;
+ int end = selection.to_line;
+ for (int i=ini; i<= end; i++)
+ {
+ if (text[i][0] == '#')
+ _remove_text(i,0,i,1);
+ }
+ }
+ else{
+ if (text[cursor.line][0] == '#')
+ _remove_text(cursor.line,0,cursor.line,1);
+ }
+ update();
+ }
+ break;}
+
+ default: {
+
+ scancode_handled=false;
+ } break;
+
+ }
+
+ if (scancode_handled)
+ accept_event();
+ /*
+ if (!scancode_handled && !k.mod.command && !k.mod.alt) {
+
+ if (k.unicode>=32) {
+
+ if (readonly)
+ break;
+
+ accept_event();
+ } else {
+
+ break;
+ }
+ }
*/
- if (!scancode_handled && !k.mod.command && !k.mod.alt) { //for german kbds
-
- if (k.unicode>=32) {
-
- if (readonly)
- break;
-
- const CharType chr[2] = {k.unicode, 0};
-
- if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) {
- _consume_pair_symbol(chr[0]);
- } else {
- _insert_text_at_cursor(chr);
- }
-
- accept_event();
- } else {
-
- break;
- }
- }
-
-
- if (!selection.selecting_test) {
-
- selection.selecting_mode=Selection::MODE_NONE;
- }
-
- return;
- } break;
-
- }
-
+ if (!scancode_handled && !k.mod.command) { //for german kbds
+
+ if (k.unicode>=32) {
+
+ if (readonly)
+ break;
+
+ const CharType chr[2] = {k.unicode, 0};
+
+ if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) {
+ _consume_pair_symbol(chr[0]);
+ } else {
+ _insert_text_at_cursor(chr);
+ }
+
+ accept_event();
+ } else {
+
+ break;
+ }
+ }
+
+
+ if (!selection.selecting_test) {
+
+ selection.selecting_mode=Selection::MODE_NONE;
+ }
+
+ return;
+ } break;
+
+ }
+
}
void TextEdit::_pre_shift_selection() {
-
-
- if (!selection.active || selection.selecting_mode!=Selection::MODE_SHIFT) {
-
- selection.selecting_line=cursor.line;
- selection.selecting_column=cursor.column;
- selection.active=true;
- selection.selecting_mode=Selection::MODE_SHIFT;
- }
+
+
+ if (!selection.active || selection.selecting_mode!=Selection::MODE_SHIFT) {
+
+ selection.selecting_line=cursor.line;
+ selection.selecting_column=cursor.column;
+ selection.active=true;
+ selection.selecting_mode=Selection::MODE_SHIFT;
+ }
}
void TextEdit::_post_shift_selection() {
-
-
- if (selection.active && selection.selecting_mode==Selection::MODE_SHIFT) {
-
- select(selection.selecting_line,selection.selecting_column,cursor.line,cursor.column);
- update();
- }
-
-
- selection.selecting_test=true;
+
+
+ if (selection.active && selection.selecting_mode==Selection::MODE_SHIFT) {
+
+ select(selection.selecting_line,selection.selecting_column,cursor.line,cursor.column);
+ update();
+ }
+
+
+ selection.selecting_test=true;
}
/**** TEXT EDIT CORE API ****/
void TextEdit::_base_insert_text(int p_line, int p_char,const String& p_text,int &r_end_line,int &r_end_column) {
-
- //save for undo...
- ERR_FAIL_INDEX(p_line,text.size());
- ERR_FAIL_COND(p_char<0);
-
- /* STEP 1 add spaces if the char is greater than the end of the line */
- while(p_char>text[p_line].length()) {
-
- text.set(p_line,text[p_line]+String::chr(' '));
- }
-
- /* STEP 2 separate dest string in pre and post text */
-
- String preinsert_text = text[p_line].substr(0,p_char);
- String postinsert_text = text[p_line].substr(p_char,text[p_line].size());
-
- /* STEP 3 remove \r from source text and separate in substrings */
-
- //buh bye \r and split
- Vector<String> substrings = p_text.replace("\r","").split("\n");
-
-
- for(int i=0;i<substrings.size();i++) {
- //insert the substrings
-
- if (i==0) {
-
- text.set(p_line,preinsert_text+substrings[i]);
- } else {
-
- text.insert(p_line+i,substrings[i]);
- }
-
- if (i==substrings.size()-1){
-
- text.set(p_line+i,text[p_line+i]+postinsert_text);
- }
- }
-
- r_end_line=p_line+substrings.size()-1;
- r_end_column=text[r_end_line].length()-postinsert_text.length();
-
- if (!text_changed_dirty && !setting_text) {
- if (is_inside_tree())
- MessageQueue::get_singleton()->push_call(this,"_text_changed_emit");
- text_changed_dirty=true;
- }
-
+
+ //save for undo...
+ ERR_FAIL_INDEX(p_line,text.size());
+ ERR_FAIL_COND(p_char<0);
+
+ /* STEP 1 add spaces if the char is greater than the end of the line */
+ while(p_char>text[p_line].length()) {
+
+ text.set(p_line,text[p_line]+String::chr(' '));
+ }
+
+ /* STEP 2 separate dest string in pre and post text */
+
+ String preinsert_text = text[p_line].substr(0,p_char);
+ String postinsert_text = text[p_line].substr(p_char,text[p_line].size());
+
+ /* STEP 3 remove \r from source text and separate in substrings */
+
+ //buh bye \r and split
+ Vector<String> substrings = p_text.replace("\r","").split("\n");
+
+
+ for(int i=0;i<substrings.size();i++) {
+ //insert the substrings
+
+ if (i==0) {
+
+ text.set(p_line,preinsert_text+substrings[i]);
+ } else {
+
+ text.insert(p_line+i,substrings[i]);
+ }
+
+ if (i==substrings.size()-1){
+
+ text.set(p_line+i,text[p_line+i]+postinsert_text);
+ }
+ }
+
+ r_end_line=p_line+substrings.size()-1;
+ r_end_column=text[r_end_line].length()-postinsert_text.length();
+
+ if (!text_changed_dirty && !setting_text) {
+ if (is_inside_tree())
+ MessageQueue::get_singleton()->push_call(this,"_text_changed_emit");
+ text_changed_dirty=true;
+ }
+
}
String TextEdit::_base_get_text(int p_from_line, int p_from_column,int p_to_line,int p_to_column) const {
-
- ERR_FAIL_INDEX_V(p_from_line,text.size(),String());
- ERR_FAIL_INDEX_V(p_from_column,text[p_from_line].length()+1,String());
- ERR_FAIL_INDEX_V(p_to_line,text.size(),String());
- ERR_FAIL_INDEX_V(p_to_column,text[p_to_line].length()+1,String());
- ERR_FAIL_COND_V(p_to_line < p_from_line ,String()); // from > to
- ERR_FAIL_COND_V(p_to_line == p_from_line && p_to_column<p_from_column,String()); // from > to
-
- String ret;
-
- for(int i=p_from_line;i<=p_to_line;i++) {
-
- int begin = (i==p_from_line)?p_from_column:0;
- int end = (i==p_to_line)?p_to_column:text[i].length();
-
- if (i>p_from_line)
- ret+="\n";
- ret+=text[i].substr(begin,end-begin);
- }
-
- return ret;
+
+ ERR_FAIL_INDEX_V(p_from_line,text.size(),String());
+ ERR_FAIL_INDEX_V(p_from_column,text[p_from_line].length()+1,String());
+ ERR_FAIL_INDEX_V(p_to_line,text.size(),String());
+ ERR_FAIL_INDEX_V(p_to_column,text[p_to_line].length()+1,String());
+ ERR_FAIL_COND_V(p_to_line < p_from_line ,String()); // from > to
+ ERR_FAIL_COND_V(p_to_line == p_from_line && p_to_column<p_from_column,String()); // from > to
+
+ String ret;
+
+ for(int i=p_from_line;i<=p_to_line;i++) {
+
+ int begin = (i==p_from_line)?p_from_column:0;
+ int end = (i==p_to_line)?p_to_column:text[i].length();
+
+ if (i>p_from_line)
+ ret+="\n";
+ ret+=text[i].substr(begin,end-begin);
+ }
+
+ return ret;
}
void TextEdit::_base_remove_text(int p_from_line, int p_from_column,int p_to_line,int p_to_column) {
-
- ERR_FAIL_INDEX(p_from_line,text.size());
- ERR_FAIL_INDEX(p_from_column,text[p_from_line].length()+1);
- ERR_FAIL_INDEX(p_to_line,text.size());
- ERR_FAIL_INDEX(p_to_column,text[p_to_line].length()+1);
- ERR_FAIL_COND(p_to_line < p_from_line ); // from > to
- ERR_FAIL_COND(p_to_line == p_from_line && p_to_column<p_from_column); // from > to
-
-
- String pre_text = text[p_from_line].substr(0,p_from_column);
- String post_text = text[p_to_line].substr(p_to_column,text[p_to_line].length());
-
- for(int i=p_from_line;i<p_to_line;i++) {
-
- text.remove(p_from_line+1);
- }
-
- text.set(p_from_line,pre_text+post_text);
-
- if (!text_changed_dirty && !setting_text) {
- if (is_inside_tree())
- MessageQueue::get_singleton()->push_call(this,"_text_changed_emit");
- text_changed_dirty=true;
- }
+
+ ERR_FAIL_INDEX(p_from_line,text.size());
+ ERR_FAIL_INDEX(p_from_column,text[p_from_line].length()+1);
+ ERR_FAIL_INDEX(p_to_line,text.size());
+ ERR_FAIL_INDEX(p_to_column,text[p_to_line].length()+1);
+ ERR_FAIL_COND(p_to_line < p_from_line ); // from > to
+ ERR_FAIL_COND(p_to_line == p_from_line && p_to_column<p_from_column); // from > to
+
+
+ String pre_text = text[p_from_line].substr(0,p_from_column);
+ String post_text = text[p_to_line].substr(p_to_column,text[p_to_line].length());
+
+ for(int i=p_from_line;i<p_to_line;i++) {
+
+ text.remove(p_from_line+1);
+ }
+
+ text.set(p_from_line,pre_text+post_text);
+
+ if (!text_changed_dirty && !setting_text) {
+ if (is_inside_tree())
+ MessageQueue::get_singleton()->push_call(this,"_text_changed_emit");
+ text_changed_dirty=true;
+ }
}
void TextEdit::_insert_text(int p_line, int p_char,const String& p_text,int *r_end_line,int *r_end_column) {
-
- if (!setting_text)
- idle_detect->start();
-
- if (undo_enabled) {
- _clear_redo();
- }
-
- int retline,retchar;
- _base_insert_text(p_line,p_char,p_text,retline,retchar);
- if (r_end_line)
- *r_end_line=retline;
- if (r_end_column)
- *r_end_column=retchar;
-
- if (!undo_enabled)
- return;
-
- /* UNDO!! */
- TextOperation op;
- op.type=TextOperation::TYPE_INSERT;
- op.from_line=p_line;
- op.from_column=p_char;
- op.to_line=retline;
- op.to_column=retchar;
- op.text=p_text;
- op.version=++version;
- op.chain_forward=false;
- op.chain_backward=false;
-
- //see if it shold just be set as current op
- if (current_op.type!=op.type) {
- _push_current_op();
- current_op=op;
-
- return; //set as current op, return
- }
- //see if it can be merged
- if (current_op.to_line!=p_line || current_op.to_column!=p_char) {
- _push_current_op();
- current_op=op;
- return; //set as current op, return
- }
- //merge current op
-
- current_op.text+=p_text;
- current_op.to_column=retchar;
- current_op.to_line=retline;
- current_op.version=op.version;
-
+
+ if (!setting_text)
+ idle_detect->start();
+
+ if (undo_enabled) {
+ _clear_redo();
+ }
+
+ int retline,retchar;
+ _base_insert_text(p_line,p_char,p_text,retline,retchar);
+ if (r_end_line)
+ *r_end_line=retline;
+ if (r_end_column)
+ *r_end_column=retchar;
+
+ if (!undo_enabled)
+ return;
+
+ /* UNDO!! */
+ TextOperation op;
+ op.type=TextOperation::TYPE_INSERT;
+ op.from_line=p_line;
+ op.from_column=p_char;
+ op.to_line=retline;
+ op.to_column=retchar;
+ op.text=p_text;
+ op.version=++version;
+ op.chain_forward=false;
+ op.chain_backward=false;
+
+ //see if it shold just be set as current op
+ if (current_op.type!=op.type) {
+ _push_current_op();
+ current_op=op;
+
+ return; //set as current op, return
+ }
+ //see if it can be merged
+ if (current_op.to_line!=p_line || current_op.to_column!=p_char) {
+ _push_current_op();
+ current_op=op;
+ return; //set as current op, return
+ }
+ //merge current op
+
+ current_op.text+=p_text;
+ current_op.to_column=retchar;
+ current_op.to_line=retline;
+ current_op.version=op.version;
+
}
void TextEdit::_remove_text(int p_from_line, int p_from_column,int p_to_line,int p_to_column) {
-
- if (!setting_text)
- idle_detect->start();
-
- String text;
- if (undo_enabled) {
- _clear_redo();
- text=_base_get_text(p_from_line,p_from_column,p_to_line,p_to_column);
- }
-
- _base_remove_text(p_from_line,p_from_column,p_to_line,p_to_column);
-
- if (!undo_enabled)
- return;
-
- /* UNDO!! */
- TextOperation op;
- op.type=TextOperation::TYPE_REMOVE;
- op.from_line=p_from_line;
- op.from_column=p_from_column;
- op.to_line=p_to_line;
- op.to_column=p_to_column;
- op.text=text;
- op.version=++version;
- op.chain_forward=false;
- op.chain_backward=false;
-
- //see if it shold just be set as current op
- if (current_op.type!=op.type) {
- _push_current_op();
- current_op=op;
- return; //set as current op, return
- }
- //see if it can be merged
- if (current_op.from_line==p_to_line && current_op.from_column==p_to_column) {
- //basckace or similar
- current_op.text=text+current_op.text;
- current_op.from_line=p_from_line;
- current_op.from_column=p_from_column;
- return; //update current op
- }
- if (current_op.from_line==p_from_line && current_op.from_column==p_from_column) {
-
- //current_op.text=text+current_op.text;
- //current_op.from_line=p_from_line;
- //current_op.from_column=p_from_column;
- //return; //update current op
- }
-
- _push_current_op();
- current_op=op;
-
+
+ if (!setting_text)
+ idle_detect->start();
+
+ String text;
+ if (undo_enabled) {
+ _clear_redo();
+ text=_base_get_text(p_from_line,p_from_column,p_to_line,p_to_column);
+ }
+
+ _base_remove_text(p_from_line,p_from_column,p_to_line,p_to_column);
+
+ if (!undo_enabled)
+ return;
+
+ /* UNDO!! */
+ TextOperation op;
+ op.type=TextOperation::TYPE_REMOVE;
+ op.from_line=p_from_line;
+ op.from_column=p_from_column;
+ op.to_line=p_to_line;
+ op.to_column=p_to_column;
+ op.text=text;
+ op.version=++version;
+ op.chain_forward=false;
+ op.chain_backward=false;
+
+ //see if it shold just be set as current op
+ if (current_op.type!=op.type) {
+ _push_current_op();
+ current_op=op;
+ return; //set as current op, return
+ }
+ //see if it can be merged
+ if (current_op.from_line==p_to_line && current_op.from_column==p_to_column) {
+ //basckace or similar
+ current_op.text=text+current_op.text;
+ current_op.from_line=p_from_line;
+ current_op.from_column=p_from_column;
+ return; //update current op
+ }
+ if (current_op.from_line==p_from_line && current_op.from_column==p_from_column) {
+
+ //current_op.text=text+current_op.text;
+ //current_op.from_line=p_from_line;
+ //current_op.from_column=p_from_column;
+ //return; //update current op
+ }
+
+ _push_current_op();
+ current_op=op;
+
}
void TextEdit::_insert_text_at_cursor(const String& p_text) {
-
- int new_column,new_line;
- _insert_text(cursor.line,cursor.column,p_text,&new_line,&new_column);
- cursor_set_line(new_line);
- cursor_set_column(new_column);
-
- update();
+
+ int new_column,new_line;
+ _insert_text(cursor.line,cursor.column,p_text,&new_line,&new_column);
+ cursor_set_line(new_line);
+ cursor_set_column(new_column);
+
+ update();
}
int TextEdit::get_char_count() {
-
- int totalsize=0;
-
- for (int i=0;i<text.size();i++) {
-
- if (i>0)
- totalsize++; // incliude \n
- totalsize+=text[i].length();
- }
-
- return totalsize; // omit last \n
+
+ int totalsize=0;
+
+ for (int i=0;i<text.size();i++) {
+
+ if (i>0)
+ totalsize++; // incliude \n
+ totalsize+=text[i].length();
+ }
+
+ return totalsize; // omit last \n
}
Size2 TextEdit::get_minimum_size() {
-
- return cache.style_normal->get_minimum_size();
+
+ return cache.style_normal->get_minimum_size();
}
int TextEdit::get_visible_rows() const {
-
- int total=cache.size.height;
- total-=cache.style_normal->get_minimum_size().height;
- total/=get_row_height();
- return total;
+
+ int total=cache.size.height;
+ total-=cache.style_normal->get_minimum_size().height;
+ total/=get_row_height();
+ return total;
}
void TextEdit::adjust_viewport_to_cursor() {
-
- if (cursor.line_ofs>cursor.line)
- cursor.line_ofs=cursor.line;
-
- int visible_width=cache.size.width-cache.style_normal->get_minimum_size().width-cache.line_number_w;
- if (v_scroll->is_visible())
- visible_width-=v_scroll->get_combined_minimum_size().width;
- visible_width-=20; // give it a little more space
-
-
- //printf("rowofs %i, visrows %i, cursor.line %i\n",cursor.line_ofs,get_visible_rows(),cursor.line);
-
- int visible_rows = get_visible_rows();
- if (h_scroll->is_visible())
- visible_rows-=((h_scroll->get_combined_minimum_size().height-1)/get_row_height());
-
- if (cursor.line>=(cursor.line_ofs+visible_rows))
- cursor.line_ofs=cursor.line-visible_rows+1;
- if (cursor.line<cursor.line_ofs)
- cursor.line_ofs=cursor.line;
-
- int cursor_x = get_column_x_offset( cursor.column, text[cursor.line] );
-
- if (cursor_x>(cursor.x_ofs+visible_width))
- cursor.x_ofs=cursor_x-visible_width+1;
-
- if (cursor_x < cursor.x_ofs)
- cursor.x_ofs=cursor_x;
-
- update();
-/*
+
+ if (cursor.line_ofs>cursor.line)
+ cursor.line_ofs=cursor.line;
+
+ int visible_width=cache.size.width-cache.style_normal->get_minimum_size().width-cache.line_number_w;
+ if (v_scroll->is_visible())
+ visible_width-=v_scroll->get_combined_minimum_size().width;
+ visible_width-=20; // give it a little more space
+
+
+ //printf("rowofs %i, visrows %i, cursor.line %i\n",cursor.line_ofs,get_visible_rows(),cursor.line);
+
+ int visible_rows = get_visible_rows();
+ if (h_scroll->is_visible())
+ visible_rows-=((h_scroll->get_combined_minimum_size().height-1)/get_row_height());
+
+ if (cursor.line>=(cursor.line_ofs+visible_rows))
+ cursor.line_ofs=cursor.line-visible_rows+1;
+ if (cursor.line<cursor.line_ofs)
+ cursor.line_ofs=cursor.line;
+
+ int cursor_x = get_column_x_offset( cursor.column, text[cursor.line] );
+
+ if (cursor_x>(cursor.x_ofs+visible_width))
+ cursor.x_ofs=cursor_x-visible_width+1;
+
+ if (cursor_x < cursor.x_ofs)
+ cursor.x_ofs=cursor_x;
+
+ update();
+ /*
get_range()->set_max(text.size());
-
+
get_range()->set_page(get_visible_rows());
-
+
get_range()->set((int)cursor.line_ofs);
*/
-
-
+
+
}
void TextEdit::cursor_set_column(int p_col) {
-
- if (p_col<0)
- p_col=0;
-
- cursor.column=p_col;
- if (cursor.column > get_line( cursor.line ).length())
- cursor.column=get_line( cursor.line ).length();
-
- cursor.last_fit_x=get_column_x_offset(cursor.column,get_line(cursor.line));
-
- adjust_viewport_to_cursor();
-
- if (!cursor_changed_dirty) {
- if (is_inside_tree())
- MessageQueue::get_singleton()->push_call(this,"_cursor_changed_emit");
- cursor_changed_dirty=true;
- }
-
+
+ if (p_col<0)
+ p_col=0;
+
+ cursor.column=p_col;
+ if (cursor.column > get_line( cursor.line ).length())
+ cursor.column=get_line( cursor.line ).length();
+
+ cursor.last_fit_x=get_column_x_offset(cursor.column,get_line(cursor.line));
+
+ adjust_viewport_to_cursor();
+
+ if (!cursor_changed_dirty) {
+ if (is_inside_tree())
+ MessageQueue::get_singleton()->push_call(this,"_cursor_changed_emit");
+ cursor_changed_dirty=true;
+ }
+
}
void TextEdit::cursor_set_line(int p_row) {
-
- if (setting_row)
- return;
-
- setting_row=true;
- if (p_row<0)
- p_row=0;
-
-
- if (p_row>=(int)text.size())
- p_row=(int)text.size()-1;
-
- cursor.line=p_row;
- cursor.column=get_char_pos_for( cursor.last_fit_x, get_line( cursor.line) );
-
-
- adjust_viewport_to_cursor();
-
- setting_row=false;
-
-
- if (!cursor_changed_dirty) {
- if (is_inside_tree())
- MessageQueue::get_singleton()->push_call(this,"_cursor_changed_emit");
- cursor_changed_dirty=true;
- }
-
+
+ if (setting_row)
+ return;
+
+ setting_row=true;
+ if (p_row<0)
+ p_row=0;
+
+
+ if (p_row>=(int)text.size())
+ p_row=(int)text.size()-1;
+
+ cursor.line=p_row;
+ cursor.column=get_char_pos_for( cursor.last_fit_x, get_line( cursor.line) );
+
+
+ adjust_viewport_to_cursor();
+
+ setting_row=false;
+
+
+ if (!cursor_changed_dirty) {
+ if (is_inside_tree())
+ MessageQueue::get_singleton()->push_call(this,"_cursor_changed_emit");
+ cursor_changed_dirty=true;
+ }
+
}
int TextEdit::cursor_get_column() const {
-
- return cursor.column;
+
+ return cursor.column;
}
int TextEdit::cursor_get_line() const {
-
- return cursor.line;
+
+ return cursor.line;
}
void TextEdit::_scroll_moved(double p_to_val) {
-
- if (updating_scrolls)
- return;
-
- if (h_scroll->is_visible())
- cursor.x_ofs=h_scroll->get_val();
- if (v_scroll->is_visible())
- cursor.line_ofs=v_scroll->get_val();
- update();
+
+ if (updating_scrolls)
+ return;
+
+ if (h_scroll->is_visible())
+ cursor.x_ofs=h_scroll->get_val();
+ if (v_scroll->is_visible())
+ cursor.line_ofs=v_scroll->get_val();
+ update();
}
@@ -2208,950 +2457,1008 @@ void TextEdit::_scroll_moved(double p_to_val) {
int TextEdit::get_row_height() const {
-
- return cache.font->get_height()+cache.line_spacing;
+
+ return cache.font->get_height()+cache.line_spacing;
}
int TextEdit::get_char_pos_for(int p_px,String p_str) const {
-
- int px=0;
- int c=0;
-
- int tab_w = cache.font->get_char_size(' ').width*tab_size;
-
- while (c<p_str.length()) {
-
- int w=0;
-
- if (p_str[c]=='\t') {
-
- int left = px%tab_w;
- if (left==0)
- w=tab_w;
- else
- w=tab_w-px%tab_w; // is right...
-
- } else {
-
- w=cache.font->get_char_size(p_str[c],p_str[c+1]).width;
- }
-
- if (p_px<(px+w/2))
- break;
- px+=w;
- c++;
- }
-
- return c;
+
+ int px=0;
+ int c=0;
+
+ int tab_w = cache.font->get_char_size(' ').width*tab_size;
+
+ while (c<p_str.length()) {
+
+ int w=0;
+
+ if (p_str[c]=='\t') {
+
+ int left = px%tab_w;
+ if (left==0)
+ w=tab_w;
+ else
+ w=tab_w-px%tab_w; // is right...
+
+ } else {
+
+ w=cache.font->get_char_size(p_str[c],p_str[c+1]).width;
+ }
+
+ if (p_px<(px+w/2))
+ break;
+ px+=w;
+ c++;
+ }
+
+ return c;
}
int TextEdit::get_column_x_offset(int p_char,String p_str) {
-
- int px=0;
-
- int tab_w = cache.font->get_char_size(' ').width*tab_size;
-
- for (int i=0;i<p_char;i++) {
-
- if (i>=p_str.length())
- break;
-
- if (p_str[i]=='\t') {
-
- int left = px%tab_w;
- if (left==0)
- px+=tab_w;
- else
- px+=tab_w-px%tab_w; // is right...
-
- } else {
- px+=cache.font->get_char_size(p_str[i],p_str[i+1]).width;
- }
- }
-
- return px;
-
+
+ int px=0;
+
+ int tab_w = cache.font->get_char_size(' ').width*tab_size;
+
+ for (int i=0;i<p_char;i++) {
+
+ if (i>=p_str.length())
+ break;
+
+ if (p_str[i]=='\t') {
+
+ int left = px%tab_w;
+ if (left==0)
+ px+=tab_w;
+ else
+ px+=tab_w-px%tab_w; // is right...
+
+ } else {
+ px+=cache.font->get_char_size(p_str[i],p_str[i+1]).width;
+ }
+ }
+
+ return px;
+
}
void TextEdit::insert_text_at_cursor(const String& p_text) {
-
- if (selection.active) {
-
- cursor_set_line(selection.from_line);
- cursor_set_column(selection.from_column);
-
- _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- selection.active=false;
- selection.selecting_mode=Selection::MODE_NONE;
-
- }
-
- _insert_text_at_cursor(p_text);
- update();
-
+
+ if (selection.active) {
+
+ cursor_set_line(selection.from_line);
+ cursor_set_column(selection.from_column);
+
+ _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ selection.active=false;
+ selection.selecting_mode=Selection::MODE_NONE;
+
+ }
+
+ _insert_text_at_cursor(p_text);
+ update();
+
}
Control::CursorShape TextEdit::get_cursor_shape(const Point2& p_pos) const {
- if(completion_active && completion_rect.has_point(p_pos)) {
- return CURSOR_ARROW;
- }
- return CURSOR_IBEAM;
+ if(completion_active && completion_rect.has_point(p_pos)) {
+ return CURSOR_ARROW;
+ }
+ return CURSOR_IBEAM;
}
void TextEdit::set_text(String p_text){
-
- setting_text=true;
- _clear();
- _insert_text_at_cursor(p_text);
-
- cursor.column=0;
- cursor.line=0;
- cursor.x_ofs=0;
- cursor.line_ofs=0;
- cursor.last_fit_x=0;
- cursor_set_line(0);
- cursor_set_column(0);
- update();
- setting_text=false;
-
- //get_range()->set(0);
+
+ setting_text=true;
+ _clear();
+ _insert_text_at_cursor(p_text);
+
+ cursor.column=0;
+ cursor.line=0;
+ cursor.x_ofs=0;
+ cursor.line_ofs=0;
+ cursor.last_fit_x=0;
+ cursor_set_line(0);
+ cursor_set_column(0);
+ update();
+ setting_text=false;
+
+ //get_range()->set(0);
};
String TextEdit::get_text() {
- String longthing;
- int len = text.size();
- for (int i=0;i<len;i++) {
-
-
- longthing+=text[i];
- if (i!=len-1)
- longthing+="\n";
- }
-
- return longthing;
+ String longthing;
+ int len = text.size();
+ for (int i=0;i<len;i++) {
+
+
+ longthing+=text[i];
+ if (i!=len-1)
+ longthing+="\n";
+ }
+
+ return longthing;
+
+};
+String TextEdit::get_text_for_completion() {
+
+ String longthing;
+ int len = text.size();
+ for (int i=0;i<len;i++) {
+
+ if (i==cursor.line) {
+ longthing+=text[i].substr(0,cursor.column);
+ longthing+=String::chr(0xFFFF); //not unicode, represents the cursor
+ longthing+=text[i].substr(cursor.column,text[i].size());
+ } else {
+
+ longthing+=text[i];
+ }
+
+
+ if (i!=len-1)
+ longthing+="\n";
+ }
+
+ return longthing;
+
};
String TextEdit::get_line(int line) const {
-
- if (line<0 || line>=text.size())
- return "";
-
- return text[line];
-
+
+ if (line<0 || line>=text.size())
+ return "";
+
+ return text[line];
+
};
void TextEdit::_clear() {
-
- clear_undo_history();
- text.clear();
- cursor.column=0;
- cursor.line=0;
- cursor.x_ofs=0;
- cursor.line_ofs=0;
- cursor.last_fit_x=0;
+
+ clear_undo_history();
+ text.clear();
+ cursor.column=0;
+ cursor.line=0;
+ cursor.x_ofs=0;
+ cursor.line_ofs=0;
+ cursor.last_fit_x=0;
}
void TextEdit::clear() {
-
- setting_text=true;
- _clear();
- setting_text=false;
-
+
+ setting_text=true;
+ _clear();
+ setting_text=false;
+
};
void TextEdit::set_readonly(bool p_readonly) {
-
-
- readonly=p_readonly;
+
+
+ readonly=p_readonly;
}
void TextEdit::set_wrap(bool p_wrap) {
-
- wrap=p_wrap;
+
+ wrap=p_wrap;
}
void TextEdit::set_max_chars(int p_max_chars) {
-
- max_chars=p_max_chars;
+
+ max_chars=p_max_chars;
}
void TextEdit::_update_caches() {
-
- cache.style_normal=get_stylebox("normal");
- cache.style_focus=get_stylebox("focus");
- cache.font=get_font("font");
- cache.font_color=get_color("font_color");
- cache.font_selected_color=get_color("font_selected_color");
- cache.keyword_color=get_color("keyword_color");
- cache.selection_color=get_color("selection_color");
- cache.mark_color=get_color("mark_color");
- cache.current_line_color=get_color("current_line_color");
- cache.breakpoint_color=get_color("breakpoint_color");
- cache.line_spacing=get_constant("line_spacing");
- cache.row_height = cache.font->get_height() + cache.line_spacing;
- cache.tab_icon=get_icon("tab");
- text.set_font(cache.font);
-
+
+ cache.style_normal=get_stylebox("normal");
+ cache.style_focus=get_stylebox("focus");
+ cache.font=get_font("font");
+ cache.font_color=get_color("font_color");
+ cache.font_selected_color=get_color("font_selected_color");
+ cache.keyword_color=get_color("keyword_color");
+ cache.selection_color=get_color("selection_color");
+ cache.mark_color=get_color("mark_color");
+ cache.current_line_color=get_color("current_line_color");
+ cache.breakpoint_color=get_color("breakpoint_color");
+ cache.brace_mismatch_color=get_color("brace_mismatch_color");
+ cache.line_spacing=get_constant("line_spacing");
+ cache.row_height = cache.font->get_height() + cache.line_spacing;
+ cache.tab_icon=get_icon("tab");
+ text.set_font(cache.font);
+
}
void TextEdit::clear_colors() {
-
- keywords.clear();
- color_regions.clear();;
- text.clear_caches();
- custom_bg_color=Color(0,0,0,0);
+
+ keywords.clear();
+ color_regions.clear();;
+ text.clear_caches();
+ custom_bg_color=Color(0,0,0,0);
}
void TextEdit::set_custom_bg_color(const Color& p_color) {
-
- custom_bg_color=p_color;
- update();
+
+ custom_bg_color=p_color;
+ update();
}
void TextEdit::add_keyword_color(const String& p_keyword,const Color& p_color) {
-
- keywords[p_keyword]=p_color;
- update();
-
+
+ keywords[p_keyword]=p_color;
+ update();
+
}
void TextEdit::add_color_region(const String& p_begin_key,const String& p_end_key,const Color &p_color,bool p_line_only) {
-
- color_regions.push_back(ColorRegion(p_begin_key,p_end_key,p_color,p_line_only));
- text.clear_caches();
- update();
-
+
+ color_regions.push_back(ColorRegion(p_begin_key,p_end_key,p_color,p_line_only));
+ text.clear_caches();
+ update();
+
}
void TextEdit::set_symbol_color(const Color& p_color) {
-
- symbol_color=p_color;
- update();
+
+ symbol_color=p_color;
+ update();
}
void TextEdit::set_syntax_coloring(bool p_enabled) {
-
- syntax_coloring=p_enabled;
- update();
+
+ syntax_coloring=p_enabled;
+ update();
}
bool TextEdit::is_syntax_coloring_enabled() const {
-
- return syntax_coloring;
+
+ return syntax_coloring;
}
void TextEdit::cut() {
-
- if (!selection.active)
- return;
-
- String clipboard = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- OS::get_singleton()->set_clipboard(clipboard);
-
- cursor_set_line(selection.from_line);
- cursor_set_column(selection.from_column);
-
- _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- selection.active=false;
- selection.selecting_mode=Selection::MODE_NONE;
- update();
-
+
+ if (!selection.active)
+ return;
+
+ String clipboard = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ OS::get_singleton()->set_clipboard(clipboard);
+
+ cursor_set_line(selection.from_line);
+ cursor_set_column(selection.from_column);
+
+ _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ selection.active=false;
+ selection.selecting_mode=Selection::MODE_NONE;
+ update();
+
}
void TextEdit::copy() {
-
- if (!selection.active)
- return;
-
- String clipboard = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- OS::get_singleton()->set_clipboard(clipboard);
-
+
+ if (!selection.active)
+ return;
+
+ String clipboard = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ OS::get_singleton()->set_clipboard(clipboard);
+
}
void TextEdit::paste() {
-
- if (selection.active) {
-
- cursor_set_line(selection.from_line);
- cursor_set_column(selection.from_column);
-
- _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
- selection.active=false;
- selection.selecting_mode=Selection::MODE_NONE;
-
- }
-
- String clipboard = OS::get_singleton()->get_clipboard();
- _insert_text_at_cursor(clipboard);
- update();
-
+
+ if (selection.active) {
+
+ cursor_set_line(selection.from_line);
+ cursor_set_column(selection.from_column);
+
+ _remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+ selection.active=false;
+ selection.selecting_mode=Selection::MODE_NONE;
+
+ }
+
+ String clipboard = OS::get_singleton()->get_clipboard();
+ _insert_text_at_cursor(clipboard);
+ update();
+
}
void TextEdit::select_all() {
-
- if (text.size()==1 && text[0].length()==0)
- return;
- selection.active=true;
- selection.from_line=0;
- selection.from_column=0;
- selection.to_line=text.size()-1;
- selection.to_column=text[selection.to_line].size();
- selection.selecting_mode=Selection::MODE_NONE;
- update();
-
+
+ if (text.size()==1 && text[0].length()==0)
+ return;
+ selection.active=true;
+ selection.from_line=0;
+ selection.from_column=0;
+ selection.to_line=text.size()-1;
+ selection.to_column=text[selection.to_line].size();
+ selection.selecting_mode=Selection::MODE_NONE;
+ update();
+
}
void TextEdit::deselect() {
-
- selection.active=false;
- update();
+
+ selection.active=false;
+ update();
}
void TextEdit::select(int p_from_line,int p_from_column,int p_to_line,int p_to_column) {
-
- if (p_from_line>=text.size())
- p_from_line=text.size()-1;
- if (p_from_column>=text[p_from_line].length())
- p_from_column=text[p_from_line].length();
-
- if (p_to_line>=text.size())
- p_to_line=text.size()-1;
- if (p_to_column>=text[p_to_line].length())
- p_to_column=text[p_to_line].length();
-
- selection.from_line=p_from_line;
- selection.from_column=p_from_column;
- selection.to_line=p_to_line;
- selection.to_column=p_to_column;
-
- selection.active=true;
-
- if (selection.from_line==selection.to_line) {
-
- if (selection.from_column==selection.to_column) {
-
- selection.active=false;
-
- } else if (selection.from_column>selection.to_column) {
-
- SWAP( selection.from_column, selection.to_column );
- }
- } else if (selection.from_line>selection.to_line) {
-
- SWAP( selection.from_line, selection.to_line );
- SWAP( selection.from_column, selection.to_column );
- }
-
-
- update();
+
+ if (p_from_line>=text.size())
+ p_from_line=text.size()-1;
+ if (p_from_column>=text[p_from_line].length())
+ p_from_column=text[p_from_line].length();
+
+ if (p_to_line>=text.size())
+ p_to_line=text.size()-1;
+ if (p_to_column>=text[p_to_line].length())
+ p_to_column=text[p_to_line].length();
+
+ selection.from_line=p_from_line;
+ selection.from_column=p_from_column;
+ selection.to_line=p_to_line;
+ selection.to_column=p_to_column;
+
+ selection.active=true;
+
+ if (selection.from_line==selection.to_line) {
+
+ if (selection.from_column==selection.to_column) {
+
+ selection.active=false;
+
+ } else if (selection.from_column>selection.to_column) {
+
+ SWAP( selection.from_column, selection.to_column );
+ }
+ } else if (selection.from_line>selection.to_line) {
+
+ SWAP( selection.from_line, selection.to_line );
+ SWAP( selection.from_column, selection.to_column );
+ }
+
+
+ update();
}
bool TextEdit::is_selection_active() const {
-
- return selection.active;
+
+ return selection.active;
}
int TextEdit::get_selection_from_line() const {
-
- ERR_FAIL_COND_V(!selection.active,-1);
- return selection.from_line;
-
+
+ ERR_FAIL_COND_V(!selection.active,-1);
+ return selection.from_line;
+
}
int TextEdit::get_selection_from_column() const {
-
- ERR_FAIL_COND_V(!selection.active,-1);
- return selection.from_column;
-
+
+ ERR_FAIL_COND_V(!selection.active,-1);
+ return selection.from_column;
+
}
int TextEdit::get_selection_to_line() const {
-
- ERR_FAIL_COND_V(!selection.active,-1);
- return selection.to_line;
-
+
+ ERR_FAIL_COND_V(!selection.active,-1);
+ return selection.to_line;
+
}
int TextEdit::get_selection_to_column() const {
-
- ERR_FAIL_COND_V(!selection.active,-1);
- return selection.to_column;
-
+
+ ERR_FAIL_COND_V(!selection.active,-1);
+ return selection.to_column;
+
}
String TextEdit::get_selection_text() const {
-
- if (!selection.active)
- return "";
-
- return _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
-
+
+ if (!selection.active)
+ return "";
+
+ return _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
+
}
String TextEdit::get_word_under_cursor() const {
-
- int prev_cc = cursor.column;
- while(prev_cc >0) {
- bool is_char = _is_text_char(text[cursor.line][prev_cc-1]);
- if (!is_char)
- break;
- --prev_cc;
- }
-
- int next_cc = cursor.column;
- while(next_cc<text[cursor.line].length()) {
- bool is_char = _is_text_char(text[cursor.line][next_cc]);
- if(!is_char)
- break;
- ++ next_cc;
- }
- if (prev_cc == cursor.column || next_cc == cursor.column)
- return "";
- return text[cursor.line].substr(prev_cc, next_cc-prev_cc);
+
+ int prev_cc = cursor.column;
+ while(prev_cc >0) {
+ bool is_char = _is_text_char(text[cursor.line][prev_cc-1]);
+ if (!is_char)
+ break;
+ --prev_cc;
+ }
+
+ int next_cc = cursor.column;
+ while(next_cc<text[cursor.line].length()) {
+ bool is_char = _is_text_char(text[cursor.line][next_cc]);
+ if(!is_char)
+ break;
+ ++ next_cc;
+ }
+ if (prev_cc == cursor.column || next_cc == cursor.column)
+ return "";
+ return text[cursor.line].substr(prev_cc, next_cc-prev_cc);
}
DVector<int> TextEdit::_search_bind(const String &p_key,uint32_t p_search_flags, int p_from_line,int p_from_column) const {
-
- int col,line;
- if (search(p_key,p_search_flags,p_from_line,p_from_column,col,line)) {
- DVector<int> result;
- result.resize(2);
- result.set(0,line);
- result.set(1,col);
- return result;
-
- } else {
-
- return DVector<int>();
- }
+
+ int col,line;
+ if (search(p_key,p_search_flags,p_from_line,p_from_column,col,line)) {
+ DVector<int> result;
+ result.resize(2);
+ result.set(0,line);
+ result.set(1,col);
+ return result;
+
+ } else {
+
+ return DVector<int>();
+ }
}
bool TextEdit::search(const String &p_key,uint32_t p_search_flags, int p_from_line, int p_from_column,int &r_line,int &r_column) const {
-
- if (p_key.length()==0)
- return false;
- ERR_FAIL_INDEX_V(p_from_line,text.size(),false);
- ERR_FAIL_INDEX_V(p_from_column,text[p_from_line].length()+1,false);
-
- //search through the whole documment, but start by current line
-
- int line=-1;
- int pos=-1;
-
- line=p_from_line;
-
- for(int i=0;i<text.size()+1;i++) {
- //backwards is broken...
- //int idx=(p_search_flags&SEARCH_BACKWARDS)?(text.size()-i):i; //do backwards seearch
-
-
- if (line<0) {
- line=text.size()-1;
- }
- if (line==text.size()) {
- line=0;
- }
-
- String text_line = text[line];
- int from_column=0;
- if (line==p_from_line) {
-
- if (i==text.size()) {
- //wrapped
-
- if (p_search_flags&SEARCH_BACKWARDS) {
- text_line=text_line.substr(from_column,text_line.length());
- from_column=text_line.length();
- } else {
- text_line=text_line.substr(0,from_column);
- from_column=0;
- }
-
- } else {
-
- from_column=p_from_column;
- }
-
-
- } else {
- //text_line=text_line.substr(0,p_from_column); //wrap around for missing begining.
- if (p_search_flags&SEARCH_BACKWARDS)
- from_column=text_line.length()-1;
- else
- from_column=0;
- }
-
- pos=-1;
-
- if (!(p_search_flags&SEARCH_BACKWARDS)) {
-
- pos = (p_search_flags&SEARCH_MATCH_CASE)?text_line.find(p_key,from_column):text_line.findn(p_key,from_column);
- } else {
-
- pos = (p_search_flags&SEARCH_MATCH_CASE)?text_line.rfind(p_key,from_column):text_line.rfindn(p_key,from_column);
- }
-
- if (pos!=-1 && (p_search_flags&SEARCH_WHOLE_WORDS)) {
- //validate for whole words
- if (pos>0 && _is_text_char(text_line[pos-1]))
- pos=-1;
- else if (_is_text_char(text_line[pos+p_key.length()]))
- pos=-1;
- }
-
- if (pos!=-1)
- break;
-
- if (p_search_flags&SEARCH_BACKWARDS)
- line--;
- else
- line++;
-
- }
-
- if (pos==-1) {
- r_line=-1;
- r_column=-1;
- return false;
- }
-
- r_line=line;
- r_column=pos;
-
-
- return true;
+
+ if (p_key.length()==0)
+ return false;
+ ERR_FAIL_INDEX_V(p_from_line,text.size(),false);
+ ERR_FAIL_INDEX_V(p_from_column,text[p_from_line].length()+1,false);
+
+ //search through the whole documment, but start by current line
+
+ int line=-1;
+ int pos=-1;
+
+ line=p_from_line;
+
+ for(int i=0;i<text.size()+1;i++) {
+ //backwards is broken...
+ //int idx=(p_search_flags&SEARCH_BACKWARDS)?(text.size()-i):i; //do backwards seearch
+
+
+ if (line<0) {
+ line=text.size()-1;
+ }
+ if (line==text.size()) {
+ line=0;
+ }
+
+ String text_line = text[line];
+ int from_column=0;
+ if (line==p_from_line) {
+
+ if (i==text.size()) {
+ //wrapped
+
+ if (p_search_flags&SEARCH_BACKWARDS) {
+ text_line=text_line.substr(from_column,text_line.length());
+ from_column=text_line.length();
+ } else {
+ text_line=text_line.substr(0,from_column);
+ from_column=0;
+ }
+
+ } else {
+
+ from_column=p_from_column;
+ }
+
+
+ } else {
+ //text_line=text_line.substr(0,p_from_column); //wrap around for missing begining.
+ if (p_search_flags&SEARCH_BACKWARDS)
+ from_column=text_line.length()-1;
+ else
+ from_column=0;
+ }
+
+ pos=-1;
+
+ if (!(p_search_flags&SEARCH_BACKWARDS)) {
+
+ pos = (p_search_flags&SEARCH_MATCH_CASE)?text_line.find(p_key,from_column):text_line.findn(p_key,from_column);
+ } else {
+
+ pos = (p_search_flags&SEARCH_MATCH_CASE)?text_line.rfind(p_key,from_column):text_line.rfindn(p_key,from_column);
+ }
+
+ if (pos!=-1 && (p_search_flags&SEARCH_WHOLE_WORDS)) {
+ //validate for whole words
+ if (pos>0 && _is_text_char(text_line[pos-1]))
+ pos=-1;
+ else if (_is_text_char(text_line[pos+p_key.length()]))
+ pos=-1;
+ }
+
+ if (pos!=-1)
+ break;
+
+ if (p_search_flags&SEARCH_BACKWARDS)
+ line--;
+ else
+ line++;
+
+ }
+
+ if (pos==-1) {
+ r_line=-1;
+ r_column=-1;
+ return false;
+ }
+
+ r_line=line;
+ r_column=pos;
+
+
+ return true;
}
void TextEdit::_cursor_changed_emit() {
-
- emit_signal("cursor_changed");
- cursor_changed_dirty=false;
+
+ emit_signal("cursor_changed");
+ cursor_changed_dirty=false;
}
void TextEdit::_text_changed_emit() {
-
- emit_signal("text_changed");
- text_changed_dirty=false;
+
+ emit_signal("text_changed");
+ text_changed_dirty=false;
}
void TextEdit::set_line_as_marked(int p_line,bool p_marked) {
-
- ERR_FAIL_INDEX(p_line,text.size());
- text.set_marked(p_line,p_marked);
- update();
+
+ ERR_FAIL_INDEX(p_line,text.size());
+ text.set_marked(p_line,p_marked);
+ update();
}
bool TextEdit::is_line_set_as_breakpoint(int p_line) const {
-
- ERR_FAIL_INDEX_V(p_line,text.size(),false);
- return text.is_breakpoint(p_line);
-
+
+ ERR_FAIL_INDEX_V(p_line,text.size(),false);
+ return text.is_breakpoint(p_line);
+
}
void TextEdit::set_line_as_breakpoint(int p_line,bool p_breakpoint) {
-
-
- ERR_FAIL_INDEX(p_line,text.size());
- text.set_breakpoint(p_line,p_breakpoint);
- update();
+
+
+ ERR_FAIL_INDEX(p_line,text.size());
+ text.set_breakpoint(p_line,p_breakpoint);
+ update();
}
void TextEdit::get_breakpoints(List<int> *p_breakpoints) const {
-
- for(int i=0;i<text.size();i++) {
- if (text.is_breakpoint(i))
- p_breakpoints->push_back(i);
- }
+
+ for(int i=0;i<text.size();i++) {
+ if (text.is_breakpoint(i))
+ p_breakpoints->push_back(i);
+ }
}
int TextEdit::get_line_count() const {
-
- return text.size();
+
+ return text.size();
}
void TextEdit::_do_text_op(const TextOperation& p_op, bool p_reverse) {
-
- ERR_FAIL_COND(p_op.type==TextOperation::TYPE_NONE);
-
- bool insert = p_op.type==TextOperation::TYPE_INSERT;
- if (p_reverse)
- insert=!insert;
-
- if (insert) {
-
- int check_line;
- int check_column;
- _base_insert_text(p_op.from_line,p_op.from_column,p_op.text,check_line,check_column);
- ERR_FAIL_COND( check_line != p_op.to_line ); // BUG
- ERR_FAIL_COND( check_column != p_op.to_column ); // BUG
- } else {
-
- _base_remove_text(p_op.from_line,p_op.from_column,p_op.to_line,p_op.to_column);
- }
-
+
+ ERR_FAIL_COND(p_op.type==TextOperation::TYPE_NONE);
+
+ bool insert = p_op.type==TextOperation::TYPE_INSERT;
+ if (p_reverse)
+ insert=!insert;
+
+ if (insert) {
+
+ int check_line;
+ int check_column;
+ _base_insert_text(p_op.from_line,p_op.from_column,p_op.text,check_line,check_column);
+ ERR_FAIL_COND( check_line != p_op.to_line ); // BUG
+ ERR_FAIL_COND( check_column != p_op.to_column ); // BUG
+ } else {
+
+ _base_remove_text(p_op.from_line,p_op.from_column,p_op.to_line,p_op.to_column);
+ }
+
}
void TextEdit::_clear_redo() {
-
- if (undo_stack_pos==NULL)
- return; //nothing to clear
-
- _push_current_op();
-
- while (undo_stack_pos) {
- List<TextOperation>::Element *elem = undo_stack_pos;
- undo_stack_pos=undo_stack_pos->next();
- undo_stack.erase(elem);
- }
+
+ if (undo_stack_pos==NULL)
+ return; //nothing to clear
+
+ _push_current_op();
+
+ while (undo_stack_pos) {
+ List<TextOperation>::Element *elem = undo_stack_pos;
+ undo_stack_pos=undo_stack_pos->next();
+ undo_stack.erase(elem);
+ }
}
void TextEdit::undo() {
-
- _push_current_op();
-
- if (undo_stack_pos==NULL) {
-
- if (!undo_stack.size())
- return; //nothing to undo
-
- undo_stack_pos=undo_stack.back();
-
- } else if (undo_stack_pos==undo_stack.front())
- return; // at the bottom of the undo stack
- else
- undo_stack_pos=undo_stack_pos->prev();
-
- _do_text_op( undo_stack_pos->get(),true);
- if(undo_stack_pos->get().chain_backward) {
- do {
- undo_stack_pos = undo_stack_pos->prev();
- _do_text_op(undo_stack_pos->get(), true);
- } while(!undo_stack_pos->get().chain_forward);
- }
-
- cursor_set_line(undo_stack_pos->get().from_line);
- cursor_set_column(undo_stack_pos->get().from_column);
- update();
+
+ _push_current_op();
+
+ if (undo_stack_pos==NULL) {
+
+ if (!undo_stack.size())
+ return; //nothing to undo
+
+ undo_stack_pos=undo_stack.back();
+
+ } else if (undo_stack_pos==undo_stack.front())
+ return; // at the bottom of the undo stack
+ else
+ undo_stack_pos=undo_stack_pos->prev();
+
+ _do_text_op( undo_stack_pos->get(),true);
+ if(undo_stack_pos->get().chain_backward) {
+ do {
+ undo_stack_pos = undo_stack_pos->prev();
+ _do_text_op(undo_stack_pos->get(), true);
+ } while(!undo_stack_pos->get().chain_forward);
+ }
+
+ cursor_set_line(undo_stack_pos->get().from_line);
+ cursor_set_column(undo_stack_pos->get().from_column);
+ update();
}
void TextEdit::redo() {
-
- _push_current_op();
-
- if (undo_stack_pos==NULL)
- return; //nothing to do.
-
- _do_text_op(undo_stack_pos->get(), false);
- if(undo_stack_pos->get().chain_forward) {
- do {
- undo_stack_pos=undo_stack_pos->next();
- _do_text_op(undo_stack_pos->get(), false);
- } while(!undo_stack_pos->get().chain_backward);
- }
- cursor_set_line(undo_stack_pos->get().from_line);
- cursor_set_column(undo_stack_pos->get().from_column);
- undo_stack_pos=undo_stack_pos->next();
- update();
+
+ _push_current_op();
+
+ if (undo_stack_pos==NULL)
+ return; //nothing to do.
+
+ _do_text_op(undo_stack_pos->get(), false);
+ if(undo_stack_pos->get().chain_forward) {
+ do {
+ undo_stack_pos=undo_stack_pos->next();
+ _do_text_op(undo_stack_pos->get(), false);
+ } while(!undo_stack_pos->get().chain_backward);
+ }
+ cursor_set_line(undo_stack_pos->get().from_line);
+ cursor_set_column(undo_stack_pos->get().from_column);
+ undo_stack_pos=undo_stack_pos->next();
+ update();
}
void TextEdit::clear_undo_history() {
-
- saved_version=0;
- current_op.type=TextOperation::TYPE_NONE;
- undo_stack_pos=NULL;
- undo_stack.clear();
-
+
+ saved_version=0;
+ current_op.type=TextOperation::TYPE_NONE;
+ undo_stack_pos=NULL;
+ undo_stack.clear();
+
}
void TextEdit::_begin_compex_operation() {
- _push_current_op();
- next_operation_is_complex=true;
+ _push_current_op();
+ next_operation_is_complex=true;
}
void TextEdit::_end_compex_operation() {
-
- _push_current_op();
- ERR_FAIL_COND(undo_stack.size() == 0);
-
- if(undo_stack.back()->get().chain_forward) {
- undo_stack.back()->get().chain_forward=false;
- return;
- }
-
- undo_stack.back()->get().chain_backward=true;
+
+ _push_current_op();
+ ERR_FAIL_COND(undo_stack.size() == 0);
+
+ if(undo_stack.back()->get().chain_forward) {
+ undo_stack.back()->get().chain_forward=false;
+ return;
+ }
+
+ undo_stack.back()->get().chain_backward=true;
}
void TextEdit::_push_current_op() {
-
- if (current_op.type==TextOperation::TYPE_NONE)
- return; // do nothing
-
- if(next_operation_is_complex) {
- current_op.chain_forward=true;
- next_operation_is_complex=false;
- }
-
- undo_stack.push_back(current_op);
- current_op.type=TextOperation::TYPE_NONE;
- current_op.text="";
- current_op.chain_forward=false;
-
+
+ if (current_op.type==TextOperation::TYPE_NONE)
+ return; // do nothing
+
+ if(next_operation_is_complex) {
+ current_op.chain_forward=true;
+ next_operation_is_complex=false;
+ }
+
+ undo_stack.push_back(current_op);
+ current_op.type=TextOperation::TYPE_NONE;
+ current_op.text="";
+ current_op.chain_forward=false;
+
}
void TextEdit::set_draw_tabs(bool p_draw) {
-
- draw_tabs=p_draw;
+
+ draw_tabs=p_draw;
}
bool TextEdit::is_drawing_tabs() const{
-
- return draw_tabs;
+
+ return draw_tabs;
}
uint32_t TextEdit::get_version() const {
- return current_op.version;
+ return current_op.version;
}
uint32_t TextEdit::get_saved_version() const {
-
- return saved_version;
+
+ return saved_version;
}
void TextEdit::tag_saved_version() {
-
- saved_version=get_version();
+
+ saved_version=get_version();
}
int TextEdit::get_v_scroll() const {
-
- return v_scroll->get_val();
+
+ return v_scroll->get_val();
}
void TextEdit::set_v_scroll(int p_scroll) {
-
- v_scroll->set_val(p_scroll);
- cursor.line_ofs=p_scroll;
+
+ v_scroll->set_val(p_scroll);
+ cursor.line_ofs=p_scroll;
}
int TextEdit::get_h_scroll() const {
-
- return h_scroll->get_val();
+
+ return h_scroll->get_val();
}
void TextEdit::set_h_scroll(int p_scroll) {
-
- h_scroll->set_val(p_scroll);
+
+ h_scroll->set_val(p_scroll);
}
void TextEdit::set_completion(bool p_enabled,const Vector<String>& p_prefixes) {
-
- completion_prefixes.clear();
- completion_enabled=p_enabled;
- for(int i=0;i<p_prefixes.size();i++)
- completion_prefixes.insert(p_prefixes[i]);
+
+ completion_prefixes.clear();
+ completion_enabled=p_enabled;
+ for(int i=0;i<p_prefixes.size();i++)
+ completion_prefixes.insert(p_prefixes[i]);
}
void TextEdit::_confirm_completion() {
-
- String remaining=completion_current.substr(completion_base.length(),completion_current.length()-completion_base.length());
- String l = text[cursor.line];
- bool same=true;
- //if what is going to be inserted is the same as what it is, don't change it
- for(int i=0;i<remaining.length();i++) {
- int c=i+cursor.column;
- if (c>=l.length() || l[c]!=remaining[i]) {
- same=false;
- break;
- }
- }
-
- if (same)
- cursor_set_column(cursor.column+remaining.length());
- else
- insert_text_at_cursor(remaining);
-
- _cancel_completion();
+
+ String remaining=completion_current.substr(completion_base.length(),completion_current.length()-completion_base.length());
+ String l = text[cursor.line];
+ bool same=true;
+ //if what is going to be inserted is the same as what it is, don't change it
+ for(int i=0;i<remaining.length();i++) {
+ int c=i+cursor.column;
+ if (c>=l.length() || l[c]!=remaining[i]) {
+ same=false;
+ break;
+ }
+ }
+
+ if (same)
+ cursor_set_column(cursor.column+remaining.length());
+ else {
+ insert_text_at_cursor(remaining);
+ if (remaining.ends_with("(") && auto_brace_completion_enabled) {
+ insert_text_at_cursor(")");
+ cursor.column--;
+ }
+ }
+
+ _cancel_completion();
+}
+
+
+void TextEdit::_cancel_code_hint() {
+ completion_hint="";
+ update();
}
void TextEdit::_cancel_completion() {
-
- if (!completion_active)
- return;
-
- completion_active=false;
- update();
-
+
+ if (!completion_active)
+ return;
+
+ completion_active=false;
+ update();
+
}
-void TextEdit::_update_completion_candidates() {
+static bool _is_completable(CharType c) {
+
+ return !_is_symbol(c) || c=='"' || c=='\'';
+}
- String l = text[cursor.line];
- int cofs = CLAMP(cursor.column,0,l.length());
-
- String s;
- while(cofs>0 && l[cofs-1]>32 && !_is_symbol(l[cofs-1])) {
- s=String::chr(l[cofs-1])+s;
- cofs--;
- }
-
- update();
-
- if (s=="" && (cofs==0 || !completion_prefixes.has(String::chr(l[cofs-1])))) {
- //none to complete, cancel
- _cancel_completion();
- return;
- }
-
- completion_options.clear();
- completion_index=0;
- completion_base=s;
- int ci_match=0;
- for(int i=0;i<completion_strings.size();i++) {
- if (completion_strings[i].begins_with(s)) {
- completion_options.push_back(completion_strings[i]);
- int m=0;
- int max=MIN(completion_current.length(),completion_strings[i].length());
- if (max<ci_match)
- continue;
- for(int j=0;j<max;j++) {
-
- if (j>=completion_strings[i].length())
- break;
- if (completion_current[j]!=completion_strings[i][j])
- break;
- m++;
- }
- if (m>ci_match) {
- ci_match=m;
- completion_index=completion_options.size()-1;
- }
-
- }
- }
-
-
-
- if (completion_options.size()==0) {
- //no options to complete, cancel
- _cancel_completion();
- return;
-
- }
-
- completion_current=completion_options[completion_index];
+void TextEdit::_update_completion_candidates() {
+
+ String l = text[cursor.line];
+ int cofs = CLAMP(cursor.column,0,l.length());
+
+
+ String s;
+
+ //look for keywords first
+
+ bool pre_keyword=false;
+
+ if (cofs>0 && l[cofs-1]==' ') {
+ int kofs=cofs-1;
+ String kw;
+ while (kofs>=0 && l[kofs]==' ')
+ kofs--;
+
+ while(kofs>=0 && l[kofs]>32 && _is_completable(l[kofs])) {
+ kw=String::chr(l[kofs])+kw;
+ kofs--;
+ }
+
+ pre_keyword=keywords.has(kw);
+ print_line("KW "+kw+"? "+itos(pre_keyword));
+
+ } else {
+
+
+ while(cofs>0 && l[cofs-1]>32 && _is_completable(l[cofs-1])) {
+ s=String::chr(l[cofs-1])+s;
+ if (l[cofs-1]=='\'' || l[cofs-1]=='"')
+ break;
+
+ cofs--;
+ }
+ }
+
+
+ update();
+
+ if (!pre_keyword && s=="" && (cofs==0 || !completion_prefixes.has(String::chr(l[cofs-1])))) {
+ //none to complete, cancel
+ _cancel_completion();
+ return;
+ }
+
+ completion_options.clear();
+ completion_index=0;
+ completion_base=s;
+ int ci_match=0;
+ for(int i=0;i<completion_strings.size();i++) {
+ if (completion_strings[i].begins_with(s)) {
+ completion_options.push_back(completion_strings[i]);
+ int m=0;
+ int max=MIN(completion_current.length(),completion_strings[i].length());
+ if (max<ci_match)
+ continue;
+ for(int j=0;j<max;j++) {
+
+ if (j>=completion_strings[i].length())
+ break;
+ if (completion_current[j]!=completion_strings[i][j])
+ break;
+ m++;
+ }
+ if (m>ci_match) {
+ ci_match=m;
+ completion_index=completion_options.size()-1;
+ }
+
+ }
+ }
+
+
+
+ if (completion_options.size()==0) {
+ //no options to complete, cancel
+ _cancel_completion();
+ return;
+
+ }
+
+ completion_current=completion_options[completion_index];
+
#if 0 // even there's only one option, user still get the chance to choose using it or not
- if (completion_options.size()==1) {
- //one option to complete, just complete it automagically
- _confirm_completion();
-// insert_text_at_cursor(completion_options[0].substr(s.length(),completion_options[0].length()-s.length()));
- _cancel_completion();
- return;
-
- }
+ if (completion_options.size()==1) {
+ //one option to complete, just complete it automagically
+ _confirm_completion();
+ // insert_text_at_cursor(completion_options[0].substr(s.length(),completion_options[0].length()-s.length()));
+ _cancel_completion();
+ return;
+
+ }
#endif
- if (completion_options.size()==1 && s==completion_options[0])
- _cancel_completion();
-
- completion_enabled=true;
+ if (completion_options.size()==1 && s==completion_options[0])
+ _cancel_completion();
+
+ completion_enabled=true;
}
-void TextEdit::query_code_comple() {
-
- String l = text[cursor.line];
- int ofs = CLAMP(cursor.column,0,l.length());
- String cs;
- while(ofs>0 && l[ofs-1]>32) {
- if (_is_symbol(l[ofs-1])) {
- String s;
- while(ofs>0 && l[ofs-1]>32 && _is_symbol(l[ofs-1])) {
- s=String::chr(l[ofs-1])+s;
- ofs--;
- }
- if (completion_prefixes.has(s))
- cs=s+cs;
- else
- break;
- } else {
- cs=String::chr(l[ofs-1])+cs;
- ofs--;
- }
-
- }
-
- if (cs!="") {
- emit_signal("request_completion",cs,cursor.line);
+void TextEdit::query_code_comple() {
+
+ String l = text[cursor.line];
+ int ofs = CLAMP(cursor.column,0,l.length());
+
+ if (ofs>0 && (_is_completable(l[ofs-1]) || completion_prefixes.has(String::chr(l[ofs-1]))))
+ emit_signal("request_completion");
+
+}
- }
+void TextEdit::set_code_hint(const String& p_hint) {
+
+ completion_hint=p_hint;
+ completion_hint_offset=-0xFFFF;
+ update();
}
void TextEdit::code_complete(const Vector<String> &p_strings) {
-
-
- completion_strings=p_strings;
- completion_active=true;
- completion_current="";
- completion_index=0;
- _update_completion_candidates();
-//
+
+
+ completion_strings=p_strings;
+ completion_active=true;
+ completion_current="";
+ completion_index=0;
+ _update_completion_candidates();
+ //
}
String TextEdit::get_tooltip(const Point2& p_pos) const {
-
- if (!tooltip_obj)
- return Control::get_tooltip(p_pos);
- int row,col;
- if (!_get_mouse_pos(p_pos, row,col)) {
- return Control::get_tooltip(p_pos);
- }
-
- String s = text[row];
- if (s.length()==0)
- return Control::get_tooltip(p_pos);
- int beg=CLAMP(col,0,s.length());
- int end=beg;
-
-
- if (s[beg]>32 || beg==s.length()) {
-
- bool symbol = beg < s.length() && _is_symbol(s[beg]); //not sure if right but most editors behave like this
-
- while(beg>0 && s[beg-1]>32 && (symbol==_is_symbol(s[beg-1]))) {
- beg--;
- }
- while(end<s.length() && s[end+1]>32 && (symbol==_is_symbol(s[end+1]))) {
- end++;
- }
-
- if (end<s.length())
- end+=1;
-
- String tt = tooltip_obj->call(tooltip_func,s.substr(beg,end-beg),tooltip_ud);
-
- return tt;
-
- }
-
- return Control::get_tooltip(p_pos);
-
+
+ if (!tooltip_obj)
+ return Control::get_tooltip(p_pos);
+ int row,col;
+ if (!_get_mouse_pos(p_pos, row,col)) {
+ return Control::get_tooltip(p_pos);
+ }
+
+ String s = text[row];
+ if (s.length()==0)
+ return Control::get_tooltip(p_pos);
+ int beg=CLAMP(col,0,s.length());
+ int end=beg;
+
+
+ if (s[beg]>32 || beg==s.length()) {
+
+ bool symbol = beg < s.length() && _is_symbol(s[beg]); //not sure if right but most editors behave like this
+
+ while(beg>0 && s[beg-1]>32 && (symbol==_is_symbol(s[beg-1]))) {
+ beg--;
+ }
+ while(end<s.length() && s[end+1]>32 && (symbol==_is_symbol(s[end+1]))) {
+ end++;
+ }
+
+ if (end<s.length())
+ end+=1;
+
+ String tt = tooltip_obj->call(tooltip_func,s.substr(beg,end-beg),tooltip_ud);
+
+ return tt;
+
+ }
+
+ return Control::get_tooltip(p_pos);
+
}
void TextEdit::set_tooltip_request_func(Object *p_obj, const StringName& p_function,const Variant& p_udata) {
-
- tooltip_obj=p_obj;
- tooltip_func=p_function;
- tooltip_ud=p_udata;
+
+ tooltip_obj=p_obj;
+ tooltip_func=p_function;
+ tooltip_ud=p_udata;
}
void TextEdit::set_line(int line, String new_text)
{
- if (line < 0 || line > text.size())
- return;
- _remove_text(line, 0, line, text[line].length());
- _insert_text(line, 0, new_text);
+ if (line < 0 || line > text.size())
+ return;
+ _remove_text(line, 0, line, text[line].length());
+ _insert_text(line, 0, new_text);
}
void TextEdit::insert_at(const String &p_text, int at)
@@ -3162,165 +3469,167 @@ void TextEdit::insert_at(const String &p_text, int at)
}
void TextEdit::set_show_line_numbers(bool p_show) {
-
- line_numbers=p_show;
- update();
+
+ line_numbers=p_show;
+ update();
}
void TextEdit::_bind_methods() {
-
-
- ObjectTypeDB::bind_method(_MD("_input_event"),&TextEdit::_input_event);
- ObjectTypeDB::bind_method(_MD("_scroll_moved"),&TextEdit::_scroll_moved);
- ObjectTypeDB::bind_method(_MD("_cursor_changed_emit"),&TextEdit::_cursor_changed_emit);
- ObjectTypeDB::bind_method(_MD("_text_changed_emit"),&TextEdit::_text_changed_emit);
- ObjectTypeDB::bind_method(_MD("_push_current_op"),&TextEdit::_push_current_op);
-
- BIND_CONSTANT( SEARCH_MATCH_CASE );
- BIND_CONSTANT( SEARCH_WHOLE_WORDS );
- BIND_CONSTANT( SEARCH_BACKWARDS );
-
-/*
+
+
+ ObjectTypeDB::bind_method(_MD("_input_event"),&TextEdit::_input_event);
+ ObjectTypeDB::bind_method(_MD("_scroll_moved"),&TextEdit::_scroll_moved);
+ ObjectTypeDB::bind_method(_MD("_cursor_changed_emit"),&TextEdit::_cursor_changed_emit);
+ ObjectTypeDB::bind_method(_MD("_text_changed_emit"),&TextEdit::_text_changed_emit);
+ ObjectTypeDB::bind_method(_MD("_push_current_op"),&TextEdit::_push_current_op);
+
+ BIND_CONSTANT( SEARCH_MATCH_CASE );
+ BIND_CONSTANT( SEARCH_WHOLE_WORDS );
+ BIND_CONSTANT( SEARCH_BACKWARDS );
+
+ /*
ObjectTypeDB::bind_method(_MD("delete_char"),&TextEdit::delete_char);
ObjectTypeDB::bind_method(_MD("delete_line"),&TextEdit::delete_line);
*/
-
- ObjectTypeDB::bind_method(_MD("set_text","text"),&TextEdit::set_text);
- ObjectTypeDB::bind_method(_MD("insert_text_at_cursor","text"),&TextEdit::insert_text_at_cursor);
-
- ObjectTypeDB::bind_method(_MD("get_line_count"),&TextEdit::get_line_count);
- ObjectTypeDB::bind_method(_MD("get_text"),&TextEdit::get_text);
- ObjectTypeDB::bind_method(_MD("get_line"),&TextEdit::get_line);
-
- ObjectTypeDB::bind_method(_MD("cursor_set_column","column"),&TextEdit::cursor_set_column);
- ObjectTypeDB::bind_method(_MD("cursor_set_line","line"),&TextEdit::cursor_set_line);
-
- ObjectTypeDB::bind_method(_MD("cursor_get_column"),&TextEdit::cursor_get_column);
- ObjectTypeDB::bind_method(_MD("cursor_get_line"),&TextEdit::cursor_get_line);
-
-
- ObjectTypeDB::bind_method(_MD("set_readonly","enable"),&TextEdit::set_readonly);
- ObjectTypeDB::bind_method(_MD("set_wrap","enable"),&TextEdit::set_wrap);
- ObjectTypeDB::bind_method(_MD("set_max_chars","amount"),&TextEdit::set_max_chars);
-
- ObjectTypeDB::bind_method(_MD("cut"),&TextEdit::cut);
- ObjectTypeDB::bind_method(_MD("copy"),&TextEdit::copy);
- ObjectTypeDB::bind_method(_MD("paste"),&TextEdit::paste);
- ObjectTypeDB::bind_method(_MD("select_all"),&TextEdit::select_all);
- ObjectTypeDB::bind_method(_MD("select","from_line","from_column","to_line","to_column"),&TextEdit::select);
-
- ObjectTypeDB::bind_method(_MD("is_selection_active"),&TextEdit::is_selection_active);
- ObjectTypeDB::bind_method(_MD("get_selection_from_line"),&TextEdit::get_selection_from_line);
- ObjectTypeDB::bind_method(_MD("get_selection_from_column"),&TextEdit::get_selection_from_column);
- ObjectTypeDB::bind_method(_MD("get_selection_to_line"),&TextEdit::get_selection_to_line);
- ObjectTypeDB::bind_method(_MD("get_selection_to_column"),&TextEdit::get_selection_to_column);
- ObjectTypeDB::bind_method(_MD("get_selection_text"),&TextEdit::get_selection_text);
- ObjectTypeDB::bind_method(_MD("get_word_under_cursor"),&TextEdit::get_word_under_cursor);
- ObjectTypeDB::bind_method(_MD("search","flags","from_line","from_column","to_line","to_column"),&TextEdit::_search_bind);
-
- ObjectTypeDB::bind_method(_MD("undo"),&TextEdit::undo);
- ObjectTypeDB::bind_method(_MD("redo"),&TextEdit::redo);
- ObjectTypeDB::bind_method(_MD("clear_undo_history"),&TextEdit::clear_undo_history);
-
- ObjectTypeDB::bind_method(_MD("set_syntax_coloring","enable"),&TextEdit::set_syntax_coloring);
- ObjectTypeDB::bind_method(_MD("is_syntax_coloring_enabled"),&TextEdit::is_syntax_coloring_enabled);
-
-
- ObjectTypeDB::bind_method(_MD("add_keyword_color","keyword","color"),&TextEdit::add_keyword_color);
- ObjectTypeDB::bind_method(_MD("add_color_region","begin_key","end_key","color","line_only"),&TextEdit::add_color_region,DEFVAL(false));
- ObjectTypeDB::bind_method(_MD("set_symbol_color","color"),&TextEdit::set_symbol_color);
- ObjectTypeDB::bind_method(_MD("set_custom_bg_color","color"),&TextEdit::set_custom_bg_color);
- ObjectTypeDB::bind_method(_MD("clear_colors"),&TextEdit::clear_colors);
-
-
- ADD_SIGNAL(MethodInfo("cursor_changed"));
- ADD_SIGNAL(MethodInfo("text_changed"));
- ADD_SIGNAL(MethodInfo("request_completion",PropertyInfo(Variant::STRING,"keyword"),PropertyInfo(Variant::INT,"line")));
-
+
+ ObjectTypeDB::bind_method(_MD("set_text","text"),&TextEdit::set_text);
+ ObjectTypeDB::bind_method(_MD("insert_text_at_cursor","text"),&TextEdit::insert_text_at_cursor);
+
+ ObjectTypeDB::bind_method(_MD("get_line_count"),&TextEdit::get_line_count);
+ ObjectTypeDB::bind_method(_MD("get_text"),&TextEdit::get_text);
+ ObjectTypeDB::bind_method(_MD("get_line"),&TextEdit::get_line);
+
+ ObjectTypeDB::bind_method(_MD("cursor_set_column","column"),&TextEdit::cursor_set_column);
+ ObjectTypeDB::bind_method(_MD("cursor_set_line","line"),&TextEdit::cursor_set_line);
+
+ ObjectTypeDB::bind_method(_MD("cursor_get_column"),&TextEdit::cursor_get_column);
+ ObjectTypeDB::bind_method(_MD("cursor_get_line"),&TextEdit::cursor_get_line);
+
+
+ ObjectTypeDB::bind_method(_MD("set_readonly","enable"),&TextEdit::set_readonly);
+ ObjectTypeDB::bind_method(_MD("set_wrap","enable"),&TextEdit::set_wrap);
+ ObjectTypeDB::bind_method(_MD("set_max_chars","amount"),&TextEdit::set_max_chars);
+
+ ObjectTypeDB::bind_method(_MD("cut"),&TextEdit::cut);
+ ObjectTypeDB::bind_method(_MD("copy"),&TextEdit::copy);
+ ObjectTypeDB::bind_method(_MD("paste"),&TextEdit::paste);
+ ObjectTypeDB::bind_method(_MD("select_all"),&TextEdit::select_all);
+ ObjectTypeDB::bind_method(_MD("select","from_line","from_column","to_line","to_column"),&TextEdit::select);
+
+ ObjectTypeDB::bind_method(_MD("is_selection_active"),&TextEdit::is_selection_active);
+ ObjectTypeDB::bind_method(_MD("get_selection_from_line"),&TextEdit::get_selection_from_line);
+ ObjectTypeDB::bind_method(_MD("get_selection_from_column"),&TextEdit::get_selection_from_column);
+ ObjectTypeDB::bind_method(_MD("get_selection_to_line"),&TextEdit::get_selection_to_line);
+ ObjectTypeDB::bind_method(_MD("get_selection_to_column"),&TextEdit::get_selection_to_column);
+ ObjectTypeDB::bind_method(_MD("get_selection_text"),&TextEdit::get_selection_text);
+ ObjectTypeDB::bind_method(_MD("get_word_under_cursor"),&TextEdit::get_word_under_cursor);
+ ObjectTypeDB::bind_method(_MD("search","flags","from_line","from_column","to_line","to_column"),&TextEdit::_search_bind);
+
+ ObjectTypeDB::bind_method(_MD("undo"),&TextEdit::undo);
+ ObjectTypeDB::bind_method(_MD("redo"),&TextEdit::redo);
+ ObjectTypeDB::bind_method(_MD("clear_undo_history"),&TextEdit::clear_undo_history);
+
+ ObjectTypeDB::bind_method(_MD("set_syntax_coloring","enable"),&TextEdit::set_syntax_coloring);
+ ObjectTypeDB::bind_method(_MD("is_syntax_coloring_enabled"),&TextEdit::is_syntax_coloring_enabled);
+
+
+ ObjectTypeDB::bind_method(_MD("add_keyword_color","keyword","color"),&TextEdit::add_keyword_color);
+ ObjectTypeDB::bind_method(_MD("add_color_region","begin_key","end_key","color","line_only"),&TextEdit::add_color_region,DEFVAL(false));
+ ObjectTypeDB::bind_method(_MD("set_symbol_color","color"),&TextEdit::set_symbol_color);
+ ObjectTypeDB::bind_method(_MD("set_custom_bg_color","color"),&TextEdit::set_custom_bg_color);
+ ObjectTypeDB::bind_method(_MD("clear_colors"),&TextEdit::clear_colors);
+
+
+ ADD_SIGNAL(MethodInfo("cursor_changed"));
+ ADD_SIGNAL(MethodInfo("text_changed"));
+ ADD_SIGNAL(MethodInfo("request_completion"));
+
}
TextEdit::TextEdit() {
-
- readonly=false;
- setting_row=false;
- draw_tabs=false;
- max_chars=0;
- clear();
- wrap=false;
- set_focus_mode(FOCUS_ALL);
- _update_caches();
- cache.size=Size2(1,1);
- tab_size=4;
- text.set_tab_size(tab_size);
- text.clear();
-// text.insert(1,"Mongolia..");
-// text.insert(2,"PAIS GENEROSO!!");
- text.set_color_regions(&color_regions);
-
- h_scroll = memnew( HScrollBar );
- v_scroll = memnew( VScrollBar );
-
- add_child(h_scroll);
- add_child(v_scroll);
-
- updating_scrolls=false;
- selection.active=false;
-
- h_scroll->connect("value_changed", this,"_scroll_moved");
- v_scroll->connect("value_changed", this,"_scroll_moved");
-
- cursor_changed_dirty=false;
- text_changed_dirty=false;
-
- selection.selecting_mode=Selection::MODE_NONE;
- selection.selecting_line=0;
- selection.selecting_column=0;
- selection.selecting_test=false;
- selection.active=false;
- syntax_coloring=false;
-
- custom_bg_color=Color(0,0,0,0);
- idle_detect = memnew( Timer );
- add_child(idle_detect);
- idle_detect->set_one_shot(true);
- idle_detect->set_wait_time(GLOBAL_DEF("display/text_edit_idle_detect_sec",3));
- idle_detect->connect("timeout", this,"_push_current_op");
-
+
+ readonly=false;
+ setting_row=false;
+ draw_tabs=false;
+ max_chars=0;
+ clear();
+ wrap=false;
+ set_focus_mode(FOCUS_ALL);
+ _update_caches();
+ cache.size=Size2(1,1);
+ tab_size=4;
+ text.set_tab_size(tab_size);
+ text.clear();
+ // text.insert(1,"Mongolia..");
+ // text.insert(2,"PAIS GENEROSO!!");
+ text.set_color_regions(&color_regions);
+
+ h_scroll = memnew( HScrollBar );
+ v_scroll = memnew( VScrollBar );
+
+ add_child(h_scroll);
+ add_child(v_scroll);
+
+ updating_scrolls=false;
+ selection.active=false;
+
+ h_scroll->connect("value_changed", this,"_scroll_moved");
+ v_scroll->connect("value_changed", this,"_scroll_moved");
+
+ cursor_changed_dirty=false;
+ text_changed_dirty=false;
+
+ selection.selecting_mode=Selection::MODE_NONE;
+ selection.selecting_line=0;
+ selection.selecting_column=0;
+ selection.selecting_test=false;
+ selection.active=false;
+ syntax_coloring=false;
+
+ custom_bg_color=Color(0,0,0,0);
+ idle_detect = memnew( Timer );
+ add_child(idle_detect);
+ idle_detect->set_one_shot(true);
+ idle_detect->set_wait_time(GLOBAL_DEF("display/text_edit_idle_detect_sec",3));
+ idle_detect->connect("timeout", this,"_push_current_op");
+
#if 0
- syntax_coloring=true;
- keywords["void"]=Color(0.3,0.0,0.1);
- keywords["int"]=Color(0.3,0.0,0.1);
- keywords["function"]=Color(0.3,0.0,0.1);
- keywords["class"]=Color(0.3,0.0,0.1);
- keywords["extends"]=Color(0.3,0.0,0.1);
- keywords["constructor"]=Color(0.3,0.0,0.1);
- symbol_color=Color(0.1,0.0,0.3,1.0);
-
- color_regions.push_back(ColorRegion("/*","*/",Color(0.4,0.6,0,4)));
- color_regions.push_back(ColorRegion("//","",Color(0.6,0.6,0.4)));
- color_regions.push_back(ColorRegion("\"","\"",Color(0.4,0.7,0.7)));
- color_regions.push_back(ColorRegion("'","'",Color(0.4,0.8,0.8)));
- color_regions.push_back(ColorRegion("#","",Color(0.2,1.0,0.2)));
-
+ syntax_coloring=true;
+ keywords["void"]=Color(0.3,0.0,0.1);
+ keywords["int"]=Color(0.3,0.0,0.1);
+ keywords["function"]=Color(0.3,0.0,0.1);
+ keywords["class"]=Color(0.3,0.0,0.1);
+ keywords["extends"]=Color(0.3,0.0,0.1);
+ keywords["constructor"]=Color(0.3,0.0,0.1);
+ symbol_color=Color(0.1,0.0,0.3,1.0);
+
+ color_regions.push_back(ColorRegion("/*","*/",Color(0.4,0.6,0,4)));
+ color_regions.push_back(ColorRegion("//","",Color(0.6,0.6,0.4)));
+ color_regions.push_back(ColorRegion("\"","\"",Color(0.4,0.7,0.7)));
+ color_regions.push_back(ColorRegion("'","'",Color(0.4,0.8,0.8)));
+ color_regions.push_back(ColorRegion("#","",Color(0.2,1.0,0.2)));
+
#endif
-
- current_op.type=TextOperation::TYPE_NONE;
- undo_enabled=true;
- undo_stack_pos=NULL;
- setting_text=false;
- last_dblclk=0;
- current_op.version=0;
- version=0;
- saved_version=0;
-
- completion_enabled=false;
- completion_active=false;
- completion_line_ofs=0;
- tooltip_obj=NULL;
- line_numbers=false;
- next_operation_is_complex=false;
- auto_brace_completion_enabled=false;
+
+ current_op.type=TextOperation::TYPE_NONE;
+ undo_enabled=true;
+ undo_stack_pos=NULL;
+ setting_text=false;
+ last_dblclk=0;
+ current_op.version=0;
+ version=0;
+ saved_version=0;
+
+ completion_enabled=false;
+ completion_active=false;
+ completion_line_ofs=0;
+ tooltip_obj=NULL;
+ line_numbers=false;
+ next_operation_is_complex=false;
+ auto_brace_completion_enabled=false;
+ brace_matching_enabled=false;
+
}
TextEdit::~TextEdit()
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h
index d70403a944..1d57aef416 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/text_edit.h
@@ -63,6 +63,7 @@ class TextEdit : public Control {
int from_line,from_column;
int to_line,to_column;
+ bool shiftclick_left;
} selection;
@@ -79,6 +80,7 @@ class TextEdit : public Control {
Color mark_color;
Color breakpoint_color;
Color current_line_color;
+ Color brace_mismatch_color;
int row_height;
int line_spacing;
@@ -185,6 +187,8 @@ class TextEdit : public Control {
int completion_index;
Rect2i completion_rect;
int completion_line_ofs;
+ String completion_hint;
+ int completion_hint_offset;
bool setting_text;
@@ -208,6 +212,7 @@ class TextEdit : public Control {
bool line_numbers;
bool auto_brace_completion_enabled;
+ bool brace_matching_enabled;
bool cut_copy_line;
uint64_t last_dblclk;
@@ -261,6 +266,7 @@ class TextEdit : public Control {
void _clear();
void _cancel_completion();
+ void _cancel_code_hint();
void _confirm_completion();
void _update_completion_candidates();
@@ -313,7 +319,11 @@ public:
inline void set_auto_brace_completion(bool p_enabled) {
auto_brace_completion_enabled = p_enabled;
}
-
+ inline void set_brace_matching(bool p_enabled) {
+ brace_matching_enabled=p_enabled;
+ update();
+ }
+
void cursor_set_column(int p_col);
void cursor_set_line(int p_row);
@@ -350,7 +360,7 @@ public:
void undo();
void redo();
- void clear_undo_history();
+ void clear_undo_history();
void set_draw_tabs(bool p_draw);
@@ -376,10 +386,13 @@ public:
void set_tooltip_request_func(Object *p_obj, const StringName& p_function, const Variant& p_udata);
- void set_completion(bool p_enabled,const Vector<String>& p_prefixes);
+ void set_completion(bool p_enabled,const Vector<String>& p_prefixes);
void code_complete(const Vector<String> &p_strings);
+ void set_code_hint(const String& p_hint);
void query_code_comple();
+ String get_text_for_completion();
+
TextEdit();
~TextEdit();
};
diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp
index 7954ac65df..1a7087b7ef 100644
--- a/scene/gui/texture_button.cpp
+++ b/scene/gui/texture_button.cpp
@@ -31,28 +31,37 @@
Size2 TextureButton::get_minimum_size() const {
+ Size2 rscale;
if (normal.is_null()) {
if (pressed.is_null()) {
if (hover.is_null())
if (click_mask.is_null())
- return Size2();
+ rscale= Size2();
else
- return click_mask->get_size();
+ rscale= click_mask->get_size();
else
- return hover->get_size();
+ rscale= hover->get_size();
} else
- return pressed->get_size();
+ rscale= pressed->get_size()*scale;
} else
- return normal->get_size();
+ rscale= normal->get_size();
+
+ return rscale*scale;
}
bool TextureButton::has_point(const Point2& p_point) const {
+ if (scale[0] <= 0 || scale[1] <= 0) {
+ return false;
+ }
+
+ Point2 ppos = p_point/scale;
+
if (click_mask.is_valid()) {
- Point2i p =p_point;
+ Point2i p =ppos;
if (p.x<0 || p.x>=click_mask->get_size().width || p.y<0 || p.y>=click_mask->get_size().height)
return false;
@@ -71,46 +80,57 @@ void TextureButton::_notification(int p_what) {
DrawMode draw_mode = get_draw_mode();
// if (normal.is_null())
// break;
+
+ Ref<Texture> texdraw;
+
switch (draw_mode) {
case DRAW_NORMAL: {
if (normal.is_valid())
- normal->draw(canvas_item,Point2());
+ texdraw=normal;
} break;
case DRAW_PRESSED: {
if (pressed.is_null()) {
if (hover.is_null()) {
if (normal.is_valid())
- normal->draw(canvas_item,Point2());
+ texdraw=normal;
} else
- hover->draw(canvas_item,Point2());
+ texdraw=hover;
} else
- pressed->draw(canvas_item,Point2());
+ texdraw=pressed;
} break;
case DRAW_HOVER: {
if (hover.is_null()) {
if (pressed.is_valid() && is_pressed())
- pressed->draw(canvas_item,Point2());
+ texdraw=pressed;
else if (normal.is_valid())
- normal->draw(canvas_item,Point2());
+ texdraw=normal;
} else
- hover->draw(canvas_item,Point2());
+ texdraw=hover;
} break;
case DRAW_DISABLED: {
if (disabled.is_null()) {
if (normal.is_valid())
- normal->draw(canvas_item,Point2());
+ texdraw=normal;
} else
- disabled->draw(canvas_item,Point2());
+ texdraw=disabled;
} break;
}
+
+ if (texdraw.is_valid()) {
+ Rect2 drect(Point2(),texdraw->get_size()*scale);
+ draw_texture_rect(texdraw,drect,false,modulate);
+
+ }
if (has_focus() && focused.is_valid()) {
- focused->draw(canvas_item, Point2());
+ Rect2 drect(Point2(),focused->get_size()*scale);
+ draw_texture_rect(focused,drect,false,modulate);
+
};
} break;
@@ -125,6 +145,8 @@ void TextureButton::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_disabled_texture","texture:Texture"),&TextureButton::set_disabled_texture);
ObjectTypeDB::bind_method(_MD("set_focused_texture","texture:Texture"),&TextureButton::set_focused_texture);
ObjectTypeDB::bind_method(_MD("set_click_mask","mask:BitMap"),&TextureButton::set_click_mask);
+ ObjectTypeDB::bind_method(_MD("set_scale","scale"),&TextureButton::set_scale);
+ ObjectTypeDB::bind_method(_MD("set_modulate","color"),&TextureButton::set_modulate);
ObjectTypeDB::bind_method(_MD("get_normal_texture:Texture"),&TextureButton::get_normal_texture);
ObjectTypeDB::bind_method(_MD("get_pressed_texture:Texture"),&TextureButton::get_pressed_texture);
@@ -132,6 +154,8 @@ void TextureButton::_bind_methods() {
ObjectTypeDB::bind_method(_MD("get_disabled_texture:Texture"),&TextureButton::get_disabled_texture);
ObjectTypeDB::bind_method(_MD("get_focused_texture:Texture"),&TextureButton::get_focused_texture);
ObjectTypeDB::bind_method(_MD("get_click_mask:BitMap"),&TextureButton::get_click_mask);
+ ObjectTypeDB::bind_method(_MD("get_scale"),&TextureButton::get_scale);
+ ObjectTypeDB::bind_method(_MD("get_modulate"),&TextureButton::get_modulate);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"textures/normal",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_normal_texture"), _SCS("get_normal_texture"));
ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"textures/pressed",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_pressed_texture"), _SCS("get_pressed_texture"));
@@ -139,6 +163,8 @@ void TextureButton::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"textures/disabled",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_disabled_texture"), _SCS("get_disabled_texture"));
ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"textures/focused",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_focused_texture"), _SCS("get_focused_texture"));
ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"textures/click_mask",PROPERTY_HINT_RESOURCE_TYPE,"BitMap"), _SCS("set_click_mask"), _SCS("get_click_mask")) ;
+ ADD_PROPERTY(PropertyInfo(Variant::VECTOR2,"params/scale",PROPERTY_HINT_RANGE,"0.01,1024,0.01"), _SCS("set_scale"), _SCS("get_scale"));
+ ADD_PROPERTY(PropertyInfo(Variant::COLOR,"params/modulate"), _SCS("set_modulate"), _SCS("get_modulate"));
}
@@ -206,6 +232,29 @@ void TextureButton::set_focused_texture(const Ref<Texture>& p_focused) {
focused = p_focused;
};
+void TextureButton::set_scale(Size2 p_scale) {
+
+ scale=p_scale;
+ minimum_size_changed();
+ update();
+}
+
+Size2 TextureButton::get_scale() const{
+
+ return scale;
+}
+
+void TextureButton::set_modulate(const Color& p_modulate) {
+ modulate=p_modulate;
+ update();
+}
+
+Color TextureButton::get_modulate() const {
+ return modulate;
+}
+
TextureButton::TextureButton() {
+ scale=Size2(1.0, 1.0);
+ modulate=Color(1,1,1);
}
diff --git a/scene/gui/texture_button.h b/scene/gui/texture_button.h
index d186966cb1..94bc53b3ff 100644
--- a/scene/gui/texture_button.h
+++ b/scene/gui/texture_button.h
@@ -41,6 +41,8 @@ class TextureButton : public BaseButton {
Ref<Texture> disabled;
Ref<Texture> focused;
Ref<BitMap> click_mask;
+ Size2 scale;
+ Color modulate;
protected:
@@ -66,6 +68,11 @@ public:
Ref<Texture> get_focused_texture() const;
Ref<BitMap> get_click_mask() const;
+ void set_scale(Size2 p_scale);
+ Size2 get_scale() const;
+
+ void set_modulate(const Color& p_modulate);
+ Color get_modulate() const;
TextureButton();
};