From fdc44142f008dd8521aa930d075d6d7071a4f85e Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Thu, 8 Aug 2013 01:14:05 -0400 Subject: [PATCH] ide/CodeEditor: (#338, #672, #976) Fixed auto complete popups --- ide/src/designer/CodeEditor.ec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ide/src/designer/CodeEditor.ec b/ide/src/designer/CodeEditor.ec index 7ee8076..417a11d 100644 --- a/ide/src/designer/CodeEditor.ec +++ b/ide/src/designer/CodeEditor.ec @@ -1521,7 +1521,8 @@ class CodeEditor : Window bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool direct) { CodeEditor editor = (CodeEditor)master; - if(!active) + Window rw = previous ? previous.rootWindow : null; + if(!active && rw != editor.paramsList) { Destroy(0); editor.membersListShown = false; @@ -1596,7 +1597,8 @@ class CodeEditor : Window bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool direct) { CodeEditor editor = (CodeEditor)master; - if(!active) + Window rw = previous ? previous.rootWindow : null; + if(!active && previous != editor.editBox && rw != editor.membersList) { Destroy(0); editor.membersListShown = false; @@ -5813,7 +5815,7 @@ class CodeEditor : Window for(link = (BTNamedLink)nameSpace.classes.first; link; link = (BTNamedLink)((BTNode)link).next) { Class _class = link.data; - if(_class.type != systemClass) + if(_class.type != systemClass && !_class.templateClass) // Omit templatized classes { DataRow row = membersList.AddString(_class.name); row.icon = (_class.type == unitClass || _class.type == enumClass) ? icons[typeDataType] : icons[typeClass]; -- 1.8.3.1