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

[BUG_FIXED] Fix NPPM_GETCURRENTIDEX bug.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@255 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2008-06-25 00:28:43 +00:00
parent 70bfdcf84d
commit f53fa31a70
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PowerEditor/src/Notepad_plus.cpp
View File

@ -794,8 +794,14 @@ void Notepad_plus::doClose(BufferID id, int whichOne) {
_lastRecentFileList.add(buf->getFilePath()); _lastRecentFileList.add(buf->getFilePath());
} }
int nrDocs = _pDocTab->nbItem();
//Do all the works //Do all the works
removeBufferFromView(id, whichOne); removeBufferFromView(id, whichOne);
if (nrDocs == 1 && canHideView(currentView()))
{ //close the view if both visible
hideView(whichOne);
}
// Notify plugins that current file is closed // Notify plugins that current file is closed
scnN.nmhdr.code = NPPN_FILECLOSED; scnN.nmhdr.code = NPPN_FILECLOSED;
@ -1146,11 +1152,11 @@ bool Notepad_plus::fileClose(BufferID id, int curView)
if (curView != -1) if (curView != -1)
viewToClose = curView; viewToClose = curView;
//first check amount of documents, we dont want the view to hide if we closed a secondary doc with primary being empty //first check amount of documents, we dont want the view to hide if we closed a secondary doc with primary being empty
int nrDocs = _pDocTab->nbItem(); //int nrDocs = _pDocTab->nbItem();
doClose(bufferID, viewToClose); doClose(bufferID, viewToClose);
if (nrDocs == 1 && canHideView(currentView())) { //close the view if both visible //if (nrDocs == 1 && canHideView(currentView())) { //close the view if both visible
hideView(viewToClose); // hideView(viewToClose);
} //}
return true; return true;
} }
@ -1197,7 +1203,7 @@ bool Notepad_plus::fileCloseAll()
for(int i = _pNonDocTab->nbItem() - 1; i >= 0; i--) { //close all from right to left for(int i = _pNonDocTab->nbItem() - 1; i >= 0; i--) { //close all from right to left
doClose(_pNonDocTab->getBufferByIndex(i), otherView()); doClose(_pNonDocTab->getBufferByIndex(i), otherView());
} }
hideView(otherView()); //hideView(otherView());
} }
activateBuffer(_pDocTab->getBufferByIndex(0), currentView()); activateBuffer(_pDocTab->getBufferByIndex(0), currentView());
@ -1255,7 +1261,7 @@ bool Notepad_plus::fileCloseAllButCurrent()
for(int i = _pNonDocTab->nbItem() - 1; i >= 0; i--) { //close all from right to left for(int i = _pNonDocTab->nbItem() - 1; i >= 0; i--) { //close all from right to left
doClose(_pNonDocTab->getBufferByIndex(i), otherView()); doClose(_pNonDocTab->getBufferByIndex(i), otherView());
} }
hideView(otherView()); //hideView(otherView());
} }
activateBuffer(_pDocTab->getBufferByIndex(0), currentView()); activateBuffer(_pDocTab->getBufferByIndex(0), currentView());
@ -1849,8 +1855,8 @@ BOOL Notepad_plus::notify(SCNotification *notification)
if (isFromPrimary || isFromSecondary) if (isFromPrimary || isFromSecondary)
open = notifyDocTab->nbItem(); open = notifyDocTab->nbItem();
doClose(bufferToClose, iView); doClose(bufferToClose, iView);
if (open == 1 && canHideView(iView)) //if (open == 1 && canHideView(iView))
hideView(iView); // hideView(iView);
break; break;
} }
@ -4786,8 +4792,6 @@ void Notepad_plus::docGotoAnotherEditView(FileTransferMode mode)
if (mode == TransferMove) { if (mode == TransferMove) {
//just close the activate document, since thats the one we moved (no search) //just close the activate document, since thats the one we moved (no search)
doClose(_pEditView->getCurrentBufferID(), currentView()); doClose(_pEditView->getCurrentBufferID(), currentView());
if (canHideView(currentView()))
hideView(currentView());
} // else it was cone, so leave it } // else it was cone, so leave it
//Activate the other view since thats where the document went //Activate the other view since thats where the document went