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

[BUG_FIXED] (Author: Pekka Pöyry) Fix the issue of document focus after canceling exit on an unsaved file.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1003 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2013-01-08 01:00:19 +00:00
parent 6c344ac24c
commit 18737c7ccd
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PowerEditor/src/NppIO.cpp
View File

@ -576,8 +576,9 @@ bool Notepad_plus::fileCloseAll()
} }
else if (buf->isDirty()) else if (buf->isDirty())
{ {
_mainDocTab.activateBuffer(id); activateBuffer(id, MAIN_VIEW);
_mainEditView.activateBuffer(id); if(!activateBuffer(id, SUB_VIEW))
switchEditViewTo(MAIN_VIEW);
int res = doSaveOrNot(buf->getFullPathName()); int res = doSaveOrNot(buf->getFullPathName());
if (res == IDYES) if (res == IDYES)
@ -601,8 +602,8 @@ bool Notepad_plus::fileCloseAll()
} }
else if (buf->isDirty()) else if (buf->isDirty())
{ {
_subDocTab.activateBuffer(id); activateBuffer(id, SUB_VIEW);
_subEditView.activateBuffer(id); switchEditViewTo(SUB_VIEW);
int res = doSaveOrNot(buf->getFullPathName()); int res = doSaveOrNot(buf->getFullPathName());
if (res == IDYES) if (res == IDYES)
@ -612,7 +613,7 @@ bool Notepad_plus::fileCloseAll()
} }
else if (res == IDCANCEL) else if (res == IDCANCEL)
{ {
return false; return false;
//otherwise continue (IDNO) //otherwise continue (IDNO)
} }
} }
@ -654,8 +655,9 @@ bool Notepad_plus::fileCloseAllButCurrent()
} }
else if (buf->isDirty()) else if (buf->isDirty())
{ {
_mainDocTab.activateBuffer(id); activateBuffer(id, MAIN_VIEW);
_mainEditView.activateBuffer(id); if(!activateBuffer(id, SUB_VIEW))
switchEditViewTo(MAIN_VIEW);
int res = doSaveOrNot(buf->getFullPathName()); int res = doSaveOrNot(buf->getFullPathName());
if (res == IDYES) if (res == IDYES)
@ -681,8 +683,8 @@ bool Notepad_plus::fileCloseAllButCurrent()
} }
else if (buf->isDirty()) else if (buf->isDirty())
{ {
_subDocTab.activateBuffer(id); activateBuffer(id, SUB_VIEW);
_subEditView.activateBuffer(id); switchEditViewTo(SUB_VIEW);
int res = doSaveOrNot(buf->getFullPathName()); int res = doSaveOrNot(buf->getFullPathName());
if (res == IDYES) if (res == IDYES)