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

Fix selection issue after switching document.

Browse Source 
Make getBufferByID inline.
Fix selection reset after reload or saving session.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@256 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
harrybharry 2008-06-25 20:10:16 +00:00
parent f53fa31a70
commit 86e358a89a
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/Notepad_plus.cpp
View File

@ -4259,6 +4259,7 @@ void Notepad_plus::setLanguage(int id, LangType langType) {
if (bothActive()) { if (bothActive()) {
if (_mainEditView.getCurrentBufferID() == _subEditView.getCurrentBufferID()) { if (_mainEditView.getCurrentBufferID() == _subEditView.getCurrentBufferID()) {
reset = true; reset = true;
_subEditView.saveCurrentPos();
prev = _subEditView.execute(SCI_GETDOCPOINTER); prev = _subEditView.execute(SCI_GETDOCPOINTER);
_subEditView.execute(SCI_SETDOCPOINTER, 0, 0); _subEditView.execute(SCI_SETDOCPOINTER, 0, 0);
} }
@ -4271,6 +4272,7 @@ void Notepad_plus::setLanguage(int id, LangType langType) {
if (reset) { if (reset) {
_subEditView.execute(SCI_SETDOCPOINTER, 0, prev); _subEditView.execute(SCI_SETDOCPOINTER, 0, prev);
_subEditView.restoreCurrentPos();
} }
}; };
@ -7916,7 +7918,9 @@ void Notepad_plus::getCurrentOpenedFiles(Session & session)
//_mainEditView.activateBuffer(mainBuf->getID()); //restore buffer //_mainEditView.activateBuffer(mainBuf->getID()); //restore buffer
//_subEditView.activateBuffer(subBuf->getID()); //restore buffer //_subEditView.activateBuffer(subBuf->getID()); //restore buffer
_mainEditView.execute(SCI_SETDOCPOINTER, 0, mainBuf->getDocument()); _mainEditView.execute(SCI_SETDOCPOINTER, 0, mainBuf->getDocument());
_mainEditView.restoreCurrentPos();
_subEditView.execute(SCI_SETDOCPOINTER, 0, subBuf->getDocument()); _subEditView.execute(SCI_SETDOCPOINTER, 0, subBuf->getDocument());
_subEditView.restoreCurrentPos();
} }
bool Notepad_plus::fileLoadSession(const char *fn) bool Notepad_plus::fileLoadSession(const char *fn)

2
PowerEditor/src/ScitillaComponent/Buffer.cpp
View File

@ -356,10 +356,12 @@ Buffer * FileManager::getBufferByIndex(int index) {
return _buffers.at(index); return _buffers.at(index);
} }
/*
Buffer * FileManager::getBufferByID(BufferID id) { Buffer * FileManager::getBufferByID(BufferID id) {
return (Buffer*)id; return (Buffer*)id;
//return _buffers.at(getBufferIndexByID(id)); //return _buffers.at(getBufferIndexByID(id));
} }
*/
void FileManager::beNotifiedOfBufferChange(Buffer * theBuf, int mask) { void FileManager::beNotifiedOfBufferChange(Buffer * theBuf, int mask) {
_pNotepadPlus->notifyBufferChanged(theBuf, mask); _pNotepadPlus->notifyBufferChanged(theBuf, mask);

3
PowerEditor/src/ScitillaComponent/Buffer.h
View File

@ -57,6 +57,7 @@ struct HeaderLineState {
const int userLangNameMax = 16; const int userLangNameMax = 16;
//File manager class maintains all buffers //File manager class maintains all buffers
class Buffer;
class FileManager { class FileManager {
public: public:
void init(Notepad_plus * pNotepadPlus, ScintillaEditView * pscratchTilla); void init(Notepad_plus * pNotepadPlus, ScintillaEditView * pscratchTilla);
@ -67,7 +68,7 @@ public:
int getNrBuffers() { return _nrBufs; }; int getNrBuffers() { return _nrBufs; };
int getBufferIndexByID(BufferID id); int getBufferIndexByID(BufferID id);
Buffer * getBufferByIndex(int index); //generates exception if index is invalid Buffer * getBufferByIndex(int index); //generates exception if index is invalid
Buffer * getBufferByID(BufferID id); //generates exception if id is invalid Buffer * getBufferByID(BufferID id) {return (Buffer*)id;}
void beNotifiedOfBufferChange(Buffer * theBuf, int mask); void beNotifiedOfBufferChange(Buffer * theBuf, int mask);

11
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -986,8 +986,8 @@ void ScintillaEditView::saveCurrentPos()
Position pos; Position pos;
// the correct visible line number // the correct visible line number
pos._firstVisibleLine = docLine; pos._firstVisibleLine = docLine;
pos._startPos = static_cast<int>(execute(SCI_GETSELECTIONSTART)); pos._startPos = static_cast<int>(execute(SCI_GETANCHOR));
pos._endPos = static_cast<int>(execute(SCI_GETSELECTIONEND)); pos._endPos = static_cast<int>(execute(SCI_GETCURRENTPOS));
pos._xOffset = static_cast<int>(execute(SCI_GETXOFFSET)); pos._xOffset = static_cast<int>(execute(SCI_GETXOFFSET));
pos._selMode = execute(SCI_GETSELECTIONMODE); pos._selMode = execute(SCI_GETSELECTIONMODE);
pos._scrollWidth = execute(SCI_GETSCROLLWIDTH); pos._scrollWidth = execute(SCI_GETSCROLLWIDTH);
@ -1002,9 +1002,10 @@ void ScintillaEditView::restoreCurrentPos()
execute(SCI_GOTOPOS, 0); //make sure first line visible by setting caret there, will scroll to top of document execute(SCI_GOTOPOS, 0); //make sure first line visible by setting caret there, will scroll to top of document
execute(SCI_SETSELECTIONMODE, pos._selMode); execute(SCI_SETSELECTIONMODE, pos._selMode); //enable
execute(SCI_SETSELECTIONSTART, pos._startPos); execute(SCI_SETANCHOR, pos._startPos);
execute(SCI_SETSELECTIONEND, pos._endPos); execute(SCI_SETCURRENTPOS, pos._endPos);
execute(SCI_CANCEL); //disable
if (!isWrap()) { //only offset if not wrapping, otherwise the offset isnt needed at all if (!isWrap()) { //only offset if not wrapping, otherwise the offset isnt needed at all
execute(SCI_SETSCROLLWIDTH, pos._scrollWidth); execute(SCI_SETSCROLLWIDTH, pos._scrollWidth);
execute(SCI_SETXOFFSET, pos._xOffset); execute(SCI_SETXOFFSET, pos._xOffset);