Merge branch 'master' of https://github.com/okamstudio/godot

2 files changed, 33 insertions, 11 deletions

diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 068801d0bb..ce268843b1 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2684,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/text_edit.cpp b/scene/gui/text_edit.cpp
index 933895a207..8afcbf3283 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -3274,19 +3274,41 @@ void TextEdit::_update_completion_candidates() {
 	
 	
 	String s;
-	
-	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--;
+
+	//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 (s=="" && (cofs==0 || !completion_prefixes.has(String::chr(l[cofs-1])))) {
+	if (!pre_keyword && s=="" && (cofs==0 || !completion_prefixes.has(String::chr(l[cofs-1])))) {
 		//none to complete, cancel
 		_cancel_completion();
 		return;