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 Change History wrong display after "Reload from Disk" command

Browse Source 
The code for fixing is from Change Lines plugin:
https://github.com/vinsworldcom/nppChangedLines/blob/main/PluginDefinition.cpp

Fix #12319, fix #12261, fix #13735, close #13858
This commit is contained in:
Don Ho 2023-07-03 21:51:35 +02:00
parent 9e24ec55db
commit 83d203561d
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PowerEditor/src/Notepad_plus.cpp
View File

@ -8656,3 +8656,16 @@ HBITMAP Notepad_plus::generateSolidColourMenuItemIcon(COLORREF colour)
return hNewBitmap; return hNewBitmap;
} }
void Notepad_plus::clearChangesHistory()
{
Sci_Position pos = (Sci_Position)::SendMessage(_pEditView->getHSelf(), SCI_GETCURRENTPOS, 0, 0);
int chFlags = (int)::SendMessage(_pEditView->getHSelf(), SCI_GETCHANGEHISTORY, 0, 0);
SendMessage(_pEditView->getHSelf(), SCI_EMPTYUNDOBUFFER, 0, 0);
SendMessage(_pEditView->getHSelf(), SCI_SETCHANGEHISTORY, SC_CHANGE_HISTORY_DISABLED, 0);
SendMessage(_pEditView->getHSelf(), SCI_SETCHANGEHISTORY, chFlags, 0);
SendMessage(_pEditView->getHSelf(), SCI_GOTOPOS, pos, 0);
}

2
PowerEditor/src/Notepad_plus.h
View File

@ -644,4 +644,6 @@ private:
void updateCommandShortcuts(); void updateCommandShortcuts();
HBITMAP generateSolidColourMenuItemIcon(COLORREF colour); HBITMAP generateSolidColourMenuItemIcon(COLORREF colour);
void clearChangesHistory();
}; };

4
PowerEditor/src/NppIO.cpp
View File

@ -588,6 +588,10 @@ 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); activateBuffer(id, currentView(), true);
if (NppParameters::getInstance().getSVP()._isChangeHistoryEnabled4NextSession)
clearChangesHistory();
return res; return res;
} }