All CC box event are now going through the CC box manager (better to connec the events to a "persistent" object rather than to a transient window)

eranif · eranif · commit ad6ff8d83bcd · 2015-02-18T20:33:34.000+02:00
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
@@ -95,7 +95,7 @@
       <Project Name="CallGraph" ConfigName="Win_x86_Release"/>
       <Project Name="abbreviation" ConfigName="Win_x86_Release"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="CMake_Release" Selected="yes">
+    <WorkspaceConfiguration Name="CMake_Release" Selected="no">
       <Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
       <Project Name="wxsqlite3" ConfigName="Win_x86_Release"/>
       <Project Name="wxshapeframework" ConfigName="Win_x86_Release"/>
@@ -267,7 +267,7 @@
       <Project Name="PHPPlugin" ConfigName="Debug_Unix"/>
       <Project Name="WordCompletion" ConfigName="DebugUnicode"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Win_x64_Release" Selected="no">
+    <WorkspaceConfiguration Name="Win_x64_Release" Selected="yes">
       <Project Name="abbreviation" ConfigName="Win_x64_Release"/>
       <Project Name="CallGraph" ConfigName="Win_x64_Release"/>
       <Project Name="CMakePlugin" ConfigName="Win_x64_Release"/>
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
@@ -2329,8 +2329,6 @@ void clMainFrame::OnClose(wxCloseEvent& event)
     IDebugger* debugger = DebuggerMgr::Get().GetActiveDebugger();
     if(debugger && debugger->IsRunning()) ManagerST::Get()->DbgStop();
 
-    
-
     // In case we got some data in the clipboard, flush it so it will be available
     // after our process exits
     wxTheClipboard->Flush();
diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
@@ -98,6 +98,7 @@
 #include "CompileCommandsCreateor.h"
 #include "CompilersModifiedDlg.h"
 #include "clKeyboardManager.h"
+#include "wxCodeCompletionBoxManager.h"
 #include "localworkspace.h"
 
 #ifndef __WXMSW__
@@ -260,6 +261,7 @@ Manager::~Manager(void)
     wxDELETE(m_breakptsmgr);
     TabGroupsManager::Free();
     clKeyboardManager::Release();
+    wxCodeCompletionBoxManager::Free();
 }
 
 //--------------------------- Workspace Loading -----------------------------
diff --git a/Plugin/wxCodeCompletionBox.cpp b/Plugin/wxCodeCompletionBox.cpp
@@ -77,11 +77,6 @@ wxCodeCompletionBox::wxCodeCompletionBox(wxWindow* parent, wxEvtHandler* eventOb
     m_canvas->Bind(wxEVT_LEFT_DOWN, &wxCodeCompletionBox::OnLeftDClick, this);
     m_canvas->Bind(wxEVT_LEFT_DCLICK, &wxCodeCompletionBox::OnLeftDClick, this);
 
-    EventNotifier::Get()->Bind(wxEVT_ALL_EDITORS_CLOSING, &wxCodeCompletionBox::OnDismissBox, this);
-    EventNotifier::Get()->Bind(wxEVT_ACTIVE_EDITOR_CHANGED, &wxCodeCompletionBox::OnDismissBox, this);
-    EventNotifier::Get()->Bind(wxEVT_EDITOR_CLOSING, &wxCodeCompletionBox::OnDismissBox, this);
-    wxTheApp->Bind(wxEVT_ACTIVATE_APP, &wxCodeCompletionBox::OnAppActivate, this);
-
     /// Set the colours
     m_lightBorder = wxColour("rgb(77, 77, 77)");
     m_darkBorder = wxColour("rgb(54, 54, 54)");
@@ -100,22 +95,7 @@ wxCodeCompletionBox::~wxCodeCompletionBox()
 {
     m_canvas->Unbind(wxEVT_LEFT_DOWN, &wxCodeCompletionBox::OnLeftDClick, this);
     m_canvas->Unbind(wxEVT_LEFT_DCLICK, &wxCodeCompletionBox::OnLeftDClick, this);
-    if(m_stc) {
-        m_stc->Unbind(wxEVT_KEY_DOWN, &wxCodeCompletionBox::StcKeyDown, this);
-        m_stc->Unbind(wxEVT_LEFT_DOWN, &wxCodeCompletionBox::StcLeftDown, this);
-    }
-
-    if(m_tipWindow) {
-        m_tipWindow->Hide();
-        m_tipWindow->Destroy();
-        m_tipWindow = NULL;
-        m_displayedTip.Clear();
-    }
-
-    wxTheApp->Unbind(wxEVT_ACTIVATE_APP, &wxCodeCompletionBox::OnAppActivate, this);
-    EventNotifier::Get()->Unbind(wxEVT_ACTIVE_EDITOR_CHANGED, &wxCodeCompletionBox::OnDismissBox, this);
-    EventNotifier::Get()->Unbind(wxEVT_EDITOR_CLOSING, &wxCodeCompletionBox::OnDismissBox, this);
-    EventNotifier::Get()->Unbind(wxEVT_ALL_EDITORS_CLOSING, &wxCodeCompletionBox::OnDismissBox, this);
+    DoDestroyTipWindow();
 }
 
 void wxCodeCompletionBox::OnEraseBackground(wxEraseEvent& event) { wxUnusedVar(event); }
@@ -265,9 +245,6 @@ void wxCodeCompletionBox::ShowCompletionBox(wxStyledTextCtrl* ctrl, const wxCode
     Show();
 
     if(m_stc) {
-        m_stc->Bind(wxEVT_KEY_DOWN, &wxCodeCompletionBox::StcKeyDown, this);
-        m_stc->Bind(wxEVT_LEFT_DOWN, &wxCodeCompletionBox::StcLeftDown, this);
-
         // Set the focus back to the completion control
         m_stc->CallAfter(&wxStyledTextCtrl::SetFocus);
     }
@@ -289,12 +266,7 @@ void wxCodeCompletionBox::DoDisplayTipWindow()
 
         if(!docComment.IsEmpty() && docComment != m_displayedTip) {
             // destroy old tip window
-            if(m_tipWindow) {
-                m_displayedTip.Clear();
-                m_tipWindow->Hide();
-                m_tipWindow->Destroy();
-                m_tipWindow = NULL;
-            }
+            DoDestroyTipWindow();
 
             // keep the old tip
             m_displayedTip = docComment;
@@ -307,12 +279,9 @@ void wxCodeCompletionBox::DoDisplayTipWindow()
             m_stc->CallAfter(&wxStyledTextCtrl::SetFocus);
         }
 
-    } else if(m_tipWindow) {
+    } else {
         // Nothing to display, just destroy the old tooltip
-        m_displayedTip.Clear();
-        m_tipWindow->Hide();
-        m_tipWindow->Destroy();
-        m_tipWindow = NULL;
+        DoDestroyTipWindow();
     }
 }
 
@@ -379,6 +348,9 @@ void wxCodeCompletionBox::StcKeyDown(wxKeyEvent& event)
     case WXK_END:
     case WXK_DELETE:
     case WXK_NUMPAD_DELETE:
+    case WXK_ALT:
+    case WXK_WINDOWS_LEFT:
+    case WXK_WINDOWS_RIGHT:
         DoDestroy();
         break;
     case WXK_TAB:
@@ -567,19 +539,6 @@ void wxCodeCompletionBox::DoUpdateList()
     }
 }
 
-void wxCodeCompletionBox::OnAppActivate(wxActivateEvent& event)
-{
-    event.Skip();
-    // Application lost / got focus - reset the tooltip
-    DoDestroy();
-}
-
-void wxCodeCompletionBox::OnDismissBox(wxCommandEvent& event)
-{
-    event.Skip();
-    DoDestroy();
-}
-
 wxCodeCompletionBoxEntry::Ptr_t wxCodeCompletionBox::TagToEntry(TagEntryPtr tag)
 {
     wxString text = tag->GetDisplayName().Trim().Trim(false);
@@ -606,10 +565,7 @@ void wxCodeCompletionBox::DoScrollUp()
     }
 }
 
-void wxCodeCompletionBox::DoDestroy()
-{
-    wxCodeCompletionBoxManager::Get().DestroyCCBox();
-}
+void wxCodeCompletionBox::DoDestroy() { wxCodeCompletionBoxManager::Get().DestroyCCBox(); }
 
 void wxCodeCompletionBox::DoDrawBottomScrollButton(wxDC& dc)
 {
@@ -665,3 +621,13 @@ void wxCodeCompletionBox::DoDrawTopScrollButton(wxDC& dc)
 bool wxCodeCompletionBox::CanScrollDown() { return ((m_index + 1) < (int)m_entries.size()); }
 
 bool wxCodeCompletionBox::CanScrollUp() { return ((m_index - 1) >= 0); }
+
+void wxCodeCompletionBox::DoDestroyTipWindow()
+{
+    if(m_tipWindow) {
+        m_tipWindow->Hide();
+        m_tipWindow->Destroy();
+        m_tipWindow = NULL;
+        m_displayedTip.Clear();
+    }
+}
diff --git a/Plugin/wxCodeCompletionBox.h b/Plugin/wxCodeCompletionBox.h
@@ -81,9 +81,7 @@ class WXDLLIMPEXP_SDK wxCodeCompletionBox : public wxCodeCompletionBoxBase
     void OnLeftDClick(wxMouseEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void OnPaint(wxPaintEvent& event);
-    void OnAppActivate(wxActivateEvent& event);
-    void OnDismissBox(wxCommandEvent& event);
-
+    
 public:
     virtual ~wxCodeCompletionBox();
     /**
@@ -126,6 +124,8 @@ class WXDLLIMPEXP_SDK wxCodeCompletionBox : public wxCodeCompletionBoxBase
     wxCodeCompletionBoxEntry::Vec_t TagsToEntries(const TagEntryPtrVector_t& tags);
     static int GetImageId(TagEntryPtr entry);
     void DoDisplayTipWindow();
+    void DoDestroyTipWindow();
+    
     void DoUpdateList();
     void DoScrollDown();
     void DoScrollUp();
diff --git a/Plugin/wxCodeCompletionBoxManager.cpp b/Plugin/wxCodeCompletionBoxManager.cpp
@@ -8,29 +8,41 @@
 #include "imanager.h"
 #include "file_logger.h"
 #include <wx/app.h>
+#include "event_notifier.h"
 
 wxCodeCompletionBoxManager::wxCodeCompletionBoxManager()
     : m_box(NULL)
     , m_stc(NULL)
 {
-    if(wxTheApp) {
-        wxTheApp->Bind(wxEVT_STC_MODIFIED, &wxCodeCompletionBoxManager::OnStcModified, this);
-        wxTheApp->Bind(wxEVT_STC_CHARADDED, &wxCodeCompletionBoxManager::OnStcCharAdded, this);
-    }
+
+    EventNotifier::Get()->Bind(wxEVT_ACTIVE_EDITOR_CHANGED, &wxCodeCompletionBoxManager::OnDismissBox, this);
+    EventNotifier::Get()->Bind(wxEVT_EDITOR_CLOSING, &wxCodeCompletionBoxManager::OnDismissBox, this);
+    EventNotifier::Get()->Bind(wxEVT_ALL_EDITORS_CLOSING, &wxCodeCompletionBoxManager::OnDismissBox, this);
+    
+    wxTheApp->Bind(wxEVT_STC_MODIFIED, &wxCodeCompletionBoxManager::OnStcModified, this);
+    wxTheApp->Bind(wxEVT_STC_CHARADDED, &wxCodeCompletionBoxManager::OnStcCharAdded, this);
+    wxTheApp->Bind(wxEVT_ACTIVATE_APP, &wxCodeCompletionBoxManager::OnAppActivate, this);
 }
 
 wxCodeCompletionBoxManager::~wxCodeCompletionBoxManager()
 {
-    if(wxTheApp) {
-        wxTheApp->Unbind(wxEVT_STC_MODIFIED, &wxCodeCompletionBoxManager::OnStcModified, this);
-        wxTheApp->Unbind(wxEVT_STC_CHARADDED, &wxCodeCompletionBoxManager::OnStcCharAdded, this);
-    }
+    DestroyCurrent();
+    EventNotifier::Get()->Unbind(wxEVT_ACTIVE_EDITOR_CHANGED, &wxCodeCompletionBoxManager::OnDismissBox, this);
+    EventNotifier::Get()->Unbind(wxEVT_EDITOR_CLOSING, &wxCodeCompletionBoxManager::OnDismissBox, this);
+    EventNotifier::Get()->Unbind(wxEVT_ALL_EDITORS_CLOSING, &wxCodeCompletionBoxManager::OnDismissBox, this);
+    
+    wxTheApp->Unbind(wxEVT_STC_MODIFIED, &wxCodeCompletionBoxManager::OnStcModified, this);
+    wxTheApp->Unbind(wxEVT_STC_CHARADDED, &wxCodeCompletionBoxManager::OnStcCharAdded, this);
+    wxTheApp->Unbind(wxEVT_ACTIVATE_APP, &wxCodeCompletionBoxManager::OnAppActivate, this);
 }
 
+static wxCodeCompletionBoxManager *manager = NULL;
 wxCodeCompletionBoxManager& wxCodeCompletionBoxManager::Get()
 {
-    static wxCodeCompletionBoxManager manager;
-    return manager;
+    if(!manager) {
+        manager = new wxCodeCompletionBoxManager();
+    }
+    return *manager;
 }
 
 void wxCodeCompletionBoxManager::ShowCompletionBox(wxStyledTextCtrl* ctrl,
@@ -66,10 +78,11 @@ void wxCodeCompletionBoxManager::ShowCompletionBox(wxStyledTextCtrl* ctrl,
 void wxCodeCompletionBoxManager::DestroyCCBox()
 {
     if(m_box) {
-        if(m_box->IsShown()) m_box->Hide();
+        if(m_box->IsShown()) {
+            m_box->Hide();
+        }
         m_box->Destroy();
     }
-
     m_box = NULL;
     m_stc = NULL;
 }
@@ -91,10 +104,7 @@ void wxCodeCompletionBoxManager::ShowCompletionBox(wxStyledTextCtrl* ctrl,
     CallAfter(&wxCodeCompletionBoxManager::DoShowCCBoxEntries, entries);
 }
 
-void wxCodeCompletionBoxManager::DestroyCurrent()
-{
-    DestroyCCBox();
-}
+void wxCodeCompletionBoxManager::DestroyCurrent() { DestroyCCBox(); }
 
 void wxCodeCompletionBoxManager::InsertSelection(const wxString& selection)
 {
@@ -161,12 +171,55 @@ void wxCodeCompletionBoxManager::DoShowCCBoxEntries(const wxCodeCompletionBoxEnt
 {
     if(m_box && m_stc) {
         m_box->ShowCompletionBox(m_stc, entries);
+        m_stc->Bind(wxEVT_KEY_DOWN, &wxCodeCompletionBoxManager::OnStcKeyDown, this);
+        m_stc->Bind(wxEVT_LEFT_DOWN, &wxCodeCompletionBoxManager::OnStcLeftDown, this);
     }
 }
 
 void wxCodeCompletionBoxManager::DoShowCCBoxTags(const TagEntryPtrVector_t& tags)
 {
     if(m_box && m_stc) {
         m_box->ShowCompletionBox(m_stc, tags);
+        m_stc->Bind(wxEVT_KEY_DOWN, &wxCodeCompletionBoxManager::OnStcKeyDown, this);
+        m_stc->Bind(wxEVT_LEFT_DOWN, &wxCodeCompletionBoxManager::OnStcLeftDown, this);
+    }
+}
+
+void wxCodeCompletionBoxManager::OnStcKeyDown(wxKeyEvent& event)
+{
+    if(m_box && m_stc && m_box->IsShown() && event.GetEventObject() == m_stc) {
+        m_box->StcKeyDown(event);
+    } else {
+        event.Skip();
+    }
+}
+
+void wxCodeCompletionBoxManager::OnStcLeftDown(wxMouseEvent& event)
+{
+    if(m_box && m_stc && m_box->IsShown() && event.GetEventObject() == m_stc) {
+        m_box->StcLeftDown(event);
+    } else {
+        event.Skip();
+    }
+}
+
+void wxCodeCompletionBoxManager::OnDismissBox(wxCommandEvent& event)
+{
+    event.Skip();
+    DestroyCCBox();
+}
+
+void wxCodeCompletionBoxManager::OnAppActivate(wxActivateEvent& event)
+{
+    event.Skip();
+    DestroyCCBox();
+}
+
+void wxCodeCompletionBoxManager::Free()
+{
+    // Destroy the manager, Unbinding all events
+    if(manager) {
+        delete manager;
+        manager = NULL;
     }
 }
diff --git a/Plugin/wxCodeCompletionBoxManager.h b/Plugin/wxCodeCompletionBoxManager.h
@@ -26,13 +26,22 @@ class WXDLLIMPEXP_SDK wxCodeCompletionBoxManager : public wxEvtHandler
     // Handle the current editor events
     void OnStcModified(wxStyledTextEvent& event);
     void OnStcCharAdded(wxStyledTextEvent& event);
-
+    void OnStcKeyDown(wxKeyEvent& event);
+    void OnStcLeftDown(wxMouseEvent& event);
+    void OnDismissBox(wxCommandEvent &event);
+    void OnAppActivate(wxActivateEvent& event);
+    
     void DoShowCCBoxTags(const TagEntryPtrVector_t& tags);
     void DoShowCCBoxEntries(const wxCodeCompletionBoxEntry::Vec_t& entries);
 
 public:
     static wxCodeCompletionBoxManager& Get();
-
+    
+    /**
+     * @brief uninitialize all event handlers and destroy the CC box manager
+     */
+    static void Free();
+    
     /**
      * @brief show the completion box
      * @param ctrl the wxSTC control requesting the completion box
