Skip to content

Commit

Permalink
final adjustments before first release
Browse files Browse the repository at this point in the history
  • Loading branch information
KnIfER committed Apr 13, 2021
1 parent 3c6ee97 commit 4da5866
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,4 @@ PowerEditor/src/MISC/md5/RCa06792
*.opendb
plugins/plugins_dev.props
plugins/BrowserWidget.props
NppSaveAsAdmin
2 changes: 2 additions & 0 deletions PowerEditor/src/Notepad_plus.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@

#include <map>

#include "InsituDebug.h"

#define MENU 0x01
#define TOOLBAR 0x02

Expand Down
5 changes: 5 additions & 0 deletions PowerEditor/src/Notepad_plus_Window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,11 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
if (nppParams.doPrintAndExit())
::SendMessage(_hSelf, NPPM_INTERNAL_PRNTANDQUIT, 0, 0);

if (TabBarPlus::isMultiLine())
{
::SendMessage(getHSelf(), WM_SIZE, 0, 0);
}

bSupressPrompt=0;
}

Expand Down
4 changes: 1 addition & 3 deletions PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,7 @@ void DockingCont::putDocker(DockingCont* item) {
}
AllDockers[AllDockerLen++]=item;

TCHAR buffer[100]={0};
wsprintf(buffer,TEXT("dockercc=%d"), AllDockerLen);
SetWindowText(StatusBarHWND, buffer);
//LogIs("dockercc=%d", AllDockerLen);
}

void DockingCont::removeDocker(DockingCont* item){
Expand Down
4 changes: 4 additions & 0 deletions PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,10 @@ LRESULT DockingManager::SendNotify(HWND hWnd, UINT message)

void DockingManager::setDockedContSize(int iCont, int iSize)
{
if (iSize==0)
{
iSize = 10;
}
if ((iCont == CONT_TOP) || (iCont == CONT_BOTTOM))
_dockData.rcRegion[iCont].bottom = iSize;
else if ((iCont == CONT_LEFT) || (iCont == CONT_RIGHT))
Expand Down
2 changes: 1 addition & 1 deletion PowerEditor/src/WinControls/DocumentMap/documentMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ INT_PTR CALLBACK DocumentMap::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
{
case DMN_CLOSE:
{
::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_DOC_MAP, 0);
setClosed(1);
return TRUE;
}

Expand Down
2 changes: 1 addition & 1 deletion PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ void FileBrowser::notified(LPNMHDR notification)
{
if (notification->code == DMN_CLOSE)
{
::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_FILEBROWSER, 0);
setClosed(1);
}
else if (notification->code == TTN_GETDISPINFO)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ void FunctionListPanel::notified(LPNMHDR notification)
}
else if (notification->code == DMN_CLOSE)
{
::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_FUNC_LIST, 0);
setClosed(1);
}
}

Expand Down
10 changes: 8 additions & 2 deletions PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -653,8 +653,7 @@ void ProjectPanel::notified(LPNMHDR notification)
{
if (notification->code == DMN_CLOSE)
{
::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_PROJECT_PANEL_1 + _panelID, 0);
SetWindowLongPtr (getHSelf(), DWLP_MSGRESULT, _isClosed ? 0 : 1);
setClosed(1);
}
else if ((notification->hwndFrom == _treeView.getHSelf()))
{
Expand Down Expand Up @@ -814,6 +813,13 @@ void ProjectPanel::notified(LPNMHDR notification)
}
}

void ProjectPanel::setClosed(bool toClose)
{
DockingDlgInterface::setClosed(toClose);
::SendMessage(getHParent(), NPPM_SETMENUITEMCHECK, IDM_VIEW_PROJECT_PANEL_1 + _panelID, !toClose);
SetWindowLongPtr (getHSelf(), DWLP_MSGRESULT, _isClosed ? 0 : 1);
}

void ProjectPanel::setWorkSpaceDirty(bool isDirty)
{
_isDirty = isDirty;
Expand Down
1 change: 1 addition & 0 deletions PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ class ProjectPanel : public DockingDlgInterface {
};
bool enumWorkSpaceFiles(HTREEITEM tvFrom, const std::vector<generic_string> & patterns, std::vector<generic_string> & fileNames);

void setClosed(bool close);
protected:
TreeView _treeView;
HIMAGELIST _hImaLst = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion plugins/LocationNavigate
Submodule LocationNavigate updated from e23adc to ed8c5b
2 changes: 1 addition & 1 deletion plugins/MultiClipboard
Submodule MultiClipboard updated from 8706d2 to 1d8126

0 comments on commit 4da5866

Please sign in to comment.