tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 07:44:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix inactive buffer reloading problem

Browse Source 
To reproduce: https://github.com/notepad-plus-plus/notepad-plus-plus/issues/16344#issuecomment-2800159956

Fix #16344, close #16431
This commit is contained in:
xomx 2025-04-15 12:07:37 +02:00 committed by Don Ho
parent 6bd3d9bfbe
commit b324a68bc6
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
PowerEditor/src/NppIO.cpp
View File

@ -553,7 +553,6 @@ BufferID Notepad_plus::doOpen(const wstring& fileName, bool isRecursive, bool is
return buffer; return buffer;
} }
bool Notepad_plus::doReload(BufferID id, bool alert) bool Notepad_plus::doReload(BufferID id, bool alert)
{ {
if (alert) if (alert)
@ -569,10 +568,10 @@ bool Notepad_plus::doReload(BufferID id, bool alert)
//In order to prevent Scintilla from restyling the entire document, //In order to prevent Scintilla from restyling the entire document,
//an empty Document is inserted during reload if needed. //an empty Document is inserted during reload if needed.
bool mainVisisble = (_mainEditView.getCurrentBufferID() == id); bool mainVisible = (_mainEditView.getCurrentBufferID() == id);
bool subVisisble = (_subEditView.getCurrentBufferID() == id); bool subVisible = (_subEditView.getCurrentBufferID() == id);
unsigned long MODEVENTMASK_ON = NppParameters::getInstance().getScintillaModEventMask(); unsigned long MODEVENTMASK_ON = NppParameters::getInstance().getScintillaModEventMask();
if (mainVisisble) if (mainVisible)
{ {
_mainEditView.saveCurrentPos(); _mainEditView.saveCurrentPos();
_mainEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_OFF); _mainEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_OFF);
@ -580,7 +579,7 @@ bool Notepad_plus::doReload(BufferID id, bool alert)
_mainEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_ON); _mainEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_ON);
} }
if (subVisisble) if (subVisible)
{ {
_subEditView.saveCurrentPos(); _subEditView.saveCurrentPos();
_subEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_OFF); _subEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_OFF);
@ -588,14 +587,14 @@ bool Notepad_plus::doReload(BufferID id, bool alert)
_subEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_ON); _subEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_ON);
} }
if (!mainVisisble && !subVisisble) if (!mainVisible && !subVisible)
{ {
return MainFileManager.reloadBufferDeferred(id); return MainFileManager.reloadBufferDeferred(id);
} }
bool res = MainFileManager.reloadBuffer(id); bool res = MainFileManager.reloadBuffer(id);
Buffer * pBuf = MainFileManager.getBufferByID(id); Buffer * pBuf = MainFileManager.getBufferByID(id);
if (mainVisisble) if (mainVisible)
{ {
_mainEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_OFF); _mainEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_OFF);
_mainEditView.execute(SCI_SETDOCPOINTER, 0, pBuf->getDocument()); _mainEditView.execute(SCI_SETDOCPOINTER, 0, pBuf->getDocument());
@ -603,7 +602,7 @@ bool Notepad_plus::doReload(BufferID id, bool alert)
_mainEditView.restoreCurrentPosPreStep(); _mainEditView.restoreCurrentPosPreStep();
} }
if (subVisisble) if (subVisible)
{ {
_subEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_OFF); _subEditView.execute(SCI_SETMODEVENTMASK, MODEVENTMASK_OFF);
_subEditView.execute(SCI_SETDOCPOINTER, 0, pBuf->getDocument()); _subEditView.execute(SCI_SETDOCPOINTER, 0, pBuf->getDocument());
@ -613,7 +612,27 @@ bool Notepad_plus::doReload(BufferID id, bool alert)
// Once reload is complete, activate buffer which will take care of // Once reload is complete, activate buffer which will take care of
// many settings such as update status bar, clickable link etc. // many settings such as update status bar, clickable link etc.
activateBuffer(id, currentView(), true); if ( ((currentView() == MAIN_VIEW) && mainVisible) || ((currentView() == SUB_VIEW) && subVisible))
{
activateBuffer(id, currentView(), true);
}
else
{
// handle also the less usual case when the reloaded buffer is not in the current active view
int originalActiveView = currentView();
BufferID originalActiveBufferID = nullptr;
if (mainVisible)
{
originalActiveBufferID = _subEditView.getCurrentBufferID();
activateBuffer(id, MAIN_VIEW, true);
}
else
{
originalActiveBufferID = _mainEditView.getCurrentBufferID();
activateBuffer(id, SUB_VIEW, true);
}
activateBuffer(originalActiveBufferID, originalActiveView, true); // set back the original
}
auto svp = NppParameters::getInstance().getSVP(); auto svp = NppParameters::getInstance().getSVP();
if (svp._isChangeHistoryMarginEnabled || svp._isChangeHistoryIndicatorEnabled) if (svp._isChangeHistoryMarginEnabled || svp._isChangeHistoryIndicatorEnabled)