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

Close all tabs in stack with single action

Browse Source 
Shift-click closes the whole stack.

Fix #8922, close #9930
This commit is contained in:
Udo Hoffmann 2021-05-31 17:52:00 +02:00 committed by Don HO
parent 511893680b
commit f9d6fb9e31
3 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PowerEditor/installer/nativeLang/english.xml
View File

@ -1436,6 +1436,7 @@ Find in all files except exe, obj && log:
<session-save-folder-as-workspace value="Save Folder as Workspace" /> <session-save-folder-as-workspace value="Save Folder as Workspace" />
<tab-untitled-string value="new " /> <tab-untitled-string value="new " />
<file-save-assign-type value="&amp;Append extension" /> <file-save-assign-type value="&amp;Append extension" />
<close-panel-tip value="Close" />
</MiscStrings> </MiscStrings>
</Native-Langue> </Native-Langue>
</NotepadPlus> </NotepadPlus>

44
PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp
View File

@ -21,6 +21,7 @@
#include "ToolTip.h" #include "ToolTip.h"
#include "Parameters.h" #include "Parameters.h"
#include "NppDarkMode.h" #include "NppDarkMode.h"
#include "localization.h"
using namespace std; using namespace std;
@ -315,7 +316,7 @@ LRESULT DockingCont::runProcCaption(HWND hwnd, UINT Message, WPARAM wParam, LPAR
if (_isMouseOver == TRUE) if (_isMouseOver == TRUE)
{ {
doClose(); doClose(GetKeyState(VK_SHIFT) < 0);
} }
_isMouseClose = FALSE; _isMouseClose = FALSE;
_isMouseOver = FALSE; _isMouseOver = FALSE;
@ -407,7 +408,9 @@ LRESULT DockingCont::runProcCaption(HWND hwnd, UINT Message, WPARAM wParam, LPAR
} }
else else
{ {
toolTip.Show(rc, TEXT("Close"), pt.x, pt.y + 20); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
generic_string tip = pNativeSpeaker->getLocalizedStrFromID("close-panel-tip", TEXT("Close"));
toolTip.Show(rc, tip.c_str(), pt.x, pt.y + 20);
} }
return TRUE; return TRUE;
} }
@ -1035,7 +1038,7 @@ INT_PTR CALLBACK DockingCont::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lP
switch (LOWORD(wParam)) switch (LOWORD(wParam))
{ {
case IDCANCEL: case IDCANCEL:
doClose(); doClose(GetKeyState(VK_SHIFT) < 0);
return TRUE; return TRUE;
default : default :
break; break;
@ -1170,13 +1173,13 @@ void DockingCont::onSize()
} }
} }
void DockingCont::doClose() void DockingCont::doClose(BOOL closeAll)
{ {
int iItemCnt = static_cast<int32_t>(::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0)); int iItemCnt = static_cast<int32_t>(::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0));
// Always close active tab first
int iItemCur = getActiveTb(); int iItemCur = getActiveTb();
TCITEM tcItem = {0}; TCITEM tcItem = {0};
tcItem.mask = TCIF_PARAM; tcItem.mask = TCIF_PARAM;
::SendMessage(_hContTab, TCM_GETITEM, iItemCur, reinterpret_cast<LPARAM>(&tcItem)); ::SendMessage(_hContTab, TCM_GETITEM, iItemCur, reinterpret_cast<LPARAM>(&tcItem));
if (tcItem.lParam) if (tcItem.lParam)
@ -1189,6 +1192,35 @@ void DockingCont::doClose()
} }
} }
// Close all other tabs if requested
if (closeAll)
{
iItemCnt = static_cast<int32_t>(::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0));
int iItemOff = 0;
for (int iItem = 0; iItem < iItemCnt; ++iItem)
{
TCITEM tcItem = {0};
// get item data
selectTab(iItemOff);
tcItem.mask = TCIF_PARAM;
::SendMessage(_hContTab, TCM_GETITEM, iItemOff, reinterpret_cast<LPARAM>(&tcItem));
if (!tcItem.lParam)
continue;
// notify child windows
if (NotifyParent(DMM_CLOSE) == 0)
{
// delete tab
hideToolbar((tTbData*)tcItem.lParam);
}
else
{
++iItemOff;
}
}
}
// Hide dialog window if all tabs closed
iItemCnt = static_cast<int32_t>(::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0)); iItemCnt = static_cast<int32_t>(::SendMessage(_hContTab, TCM_GETITEMCOUNT, 0, 0));
if (iItemCnt == 0) if (iItemCnt == 0)
{ {

2
PowerEditor/src/WinControls/DockingWnd/DockingCont.h
View File

@ -155,7 +155,7 @@ protected :
eMousePos isInRect(HWND hwnd, int x, int y); eMousePos isInRect(HWND hwnd, int x, int y);
// handling of toolbars // handling of toolbars
void doClose(); void doClose(BOOL closeAll);
// return new item // return new item
int searchPosInTab(tTbData* pTbData); int searchPosInTab(tTbData* pTbData);