summaryrefslogtreecommitdiff
path: root/scene/gui/text_edit.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-11-19 00:30:39 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-11-19 00:30:39 -0300
commitb6084a8a623e7af1d323b5284ac8f670a4c2e5d0 (patch)
treebd25e07f92bceff2f6824cfc8b3ac82e481fd799 /scene/gui/text_edit.h
parent9a7769f194cdc5f585b090f29a950dbb466b2940 (diff)
parentb70e2b754d44eb360c6485029afc589c4476bfe8 (diff)
Merge pull request #2364 from neikeq/textedit_select
Some TextEdit selection improvements
Diffstat (limited to 'scene/gui/text_edit.h')
-rw-r--r--scene/gui/text_edit.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h
index 9ffe8a5bae..059e15dcff 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/text_edit.h
@@ -55,7 +55,7 @@ class TextEdit : public Control {
Mode selecting_mode;
int selecting_line,selecting_column;
- bool selecting_test;
+ bool selecting_text;
bool active;
@@ -270,7 +270,7 @@ class TextEdit : public Control {
void _confirm_completion();
void _update_completion_candidates();
- bool _get_mouse_pos(const Point2i& p_mouse, int &r_row, int &r_col) const;
+ void _get_mouse_pos(const Point2i& p_mouse, int &r_row, int &r_col) const;
protected:
@@ -324,8 +324,8 @@ public:
update();
}
- void cursor_set_column(int p_col);
- void cursor_set_line(int p_row);
+ void cursor_set_column(int p_col, bool p_adjust_viewport=true);
+ void cursor_set_line(int p_row, bool p_adjust_viewport=true);
int cursor_get_column() const;
int cursor_get_line() const;