Fixed: closing a modified tab on Linux / macOS causes to lose modifie…

…d changes closes issue #3367
eranif · May 24, 2024 · 918a43f · 918a43f
1 parent 9ef399d
commit 918a43f
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 11 deletions.
diff --git a/DebugAdapterClient/DebugAdapterClient.cpp b/DebugAdapterClient/DebugAdapterClient.cpp
@@ -38,6 +38,7 @@
 #include "StringUtils.h"
 #include "asyncprocess.h"
 #include "bookmark_manager.h"
+#include "clAuiBook.hpp"
 #include "clFileSystemWorkspace.hpp"
 #include "clResizableTooltip.h"
 #include "clWorkspaceManager.h"
@@ -51,7 +52,6 @@
 #include "globals.h"
 #include "macromanager.h"
 #include "processreaderthread.h"
-#include "clAuiBook.hpp"
 
 #include <wx/aui/framemanager.h>
 #include <wx/filename.h>
@@ -645,7 +645,7 @@ void DebugAdapterClient::DestroyUI()
     if (m_textView) {
         int index = clGetManager()->GetMainNotebook()->FindPage(m_textView);
         if (index != wxNOT_FOUND) {
-            clGetManager()->GetMainNotebook()->RemovePage(index);
+            clGetManager()->GetMainNotebook()->RemovePage(index, false);
         }
         m_textView->Destroy();
         m_textView = nullptr;

diff --git a/Interfaces/imanager.h b/Interfaces/imanager.h
@@ -59,7 +59,7 @@ class clInfoBar;
 class clGenericNotebook;
 class clAuiBook;
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
 #define MAINBOOK_AUIBOOK 0
 #else
 #define MAINBOOK_AUIBOOK 1

diff --git a/LiteEditor/mainbook.cpp b/LiteEditor/mainbook.cpp
@@ -927,10 +927,10 @@ bool MainBook::ClosePage(wxWindow* page)
 {
     int pos = m_book->GetPageIndex(page);
     if (pos != wxNOT_FOUND && m_book->GetPage(pos) == m_welcomePage) {
-        m_book->RemovePage(pos);
+        m_book->RemovePage(pos, false);
         return true;
     } else {
-        return pos != wxNOT_FOUND && m_book->DeletePage(pos);
+        return pos != wxNOT_FOUND && m_book->DeletePage(pos, true);
     }
 }
 
@@ -1536,7 +1536,7 @@ bool MainBook::ClosePage(IEditor* editor, bool notify)
     if (!page)
         return false;
     int pos = m_book->GetPageIndex(page);
-    return (pos != wxNOT_FOUND) && (m_book->DeletePage(pos));
+    return (pos != wxNOT_FOUND) && (m_book->DeletePage(pos, true));
 }
 
 void MainBook::DoOpenFile(const wxString& filename, const wxString& content)

diff --git a/Plugin/clAuiBook.cpp b/Plugin/clAuiBook.cpp
@@ -320,7 +320,7 @@ void clAuiBook::MoveActivePage(int newIndex)
 
     wxString label = GetPageText(cursel);
     wxBitmap bmp = GetPageBitmap(cursel);
-    if (RemovePage(cursel)) {
+    if (RemovePage(cursel, false)) {
         InsertPage(newIndex, page, label, true, bmp);
     }
 }
@@ -378,7 +378,7 @@ void clAuiBook::OnPageChanged(wxAuiNotebookEvent& event)
 
     // Send an event
     wxBookCtrlEvent changed_event(wxEVT_BOOK_PAGE_CHANGED);
-    changed_event.SetEventObject(GetParent());
+    changed_event.SetEventObject(this);
     changed_event.SetSelection(GetSelection());
     GetEventHandler()->AddPendingEvent(changed_event);
 }
@@ -415,9 +415,9 @@ void clAuiBook::OnPageDoubleClick(wxAuiNotebookEvent& event)
     }
     wxUnusedVar(event);
     wxBookCtrlEvent e(wxEVT_BOOK_TAB_DCLICKED);
-    e.SetEventObject(GetParent());
+    e.SetEventObject(this);
     e.SetSelection(GetSelection());
-    GetParent()->GetEventHandler()->AddPendingEvent(e);
+    GetEventHandler()->AddPendingEvent(e);
 }
 
 void clAuiBook::OnTabAreaDoubleClick(wxAuiNotebookEvent& event)
@@ -429,7 +429,7 @@ void clAuiBook::OnTabAreaDoubleClick(wxAuiNotebookEvent& event)
     }
 
     wxBookCtrlEvent e(wxEVT_BOOK_NEW_PAGE);
-    e.SetEventObject(GetParent());
+    e.SetEventObject(this);
     GetEventHandler()->AddPendingEvent(e);
 }
 
@@ -551,3 +551,53 @@ int clAuiBook::GetPageIndex(const wxString& name) const
     }
     return wxNOT_FOUND;
 }
+
+bool clAuiBook::DeletePage(size_t index, bool notify)
+{
+    if (notify) {
+        wxBookCtrlEvent event(wxEVT_BOOK_PAGE_CLOSING);
+        event.SetEventObject(this);
+        event.SetSelection(index);
+        GetEventHandler()->ProcessEvent(event);
+        if (!event.IsAllowed()) {
+            // Vetoed
+            return false;
+        }
+    }
+
+    if (!wxAuiNotebook::DeletePage(index)) {
+        return false;
+    }
+
+    if (notify) {
+        wxBookCtrlEvent event(wxEVT_BOOK_PAGE_CLOSED);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+    }
+    return true;
+}
+
+bool clAuiBook::RemovePage(size_t index, bool notify)
+{
+    if (notify) {
+        wxBookCtrlEvent event(wxEVT_BOOK_PAGE_CLOSING);
+        event.SetEventObject(this);
+        event.SetSelection(index);
+        GetEventHandler()->ProcessEvent(event);
+        if (!event.IsAllowed()) {
+            // Vetoed
+            return false;
+        }
+    }
+
+    if (!wxAuiNotebook::RemovePage(index)) {
+        return false;
+    }
+
+    if (notify) {
+        wxBookCtrlEvent event(wxEVT_BOOK_PAGE_CLOSED);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+    }
+    return true;
+}
diff --git a/Plugin/clAuiBook.hpp b/Plugin/clAuiBook.hpp
@@ -27,6 +27,8 @@ class WXDLLIMPEXP_SDK clAuiBook : public wxAuiNotebook
     void SetCanHaveCloseButton(bool b) { m_canHaveCloseButton = b; }
     int GetPageIndex(const wxString& name) const;
     int GetPageIndex(wxWindow* win) const;
+    bool DeletePage(size_t index, bool notify);
+    bool RemovePage(size_t index, bool notify);
 
 protected:
     void OnPageClosed(wxAuiNotebookEvent& event);