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

[BUG_FIXED] Fix Doc Map resized and dropped display bug.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@862 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2012-02-09 21:51:13 +00:00
parent 7c23050155
commit 73ffaa8554
3 changed files with 68 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1100,7 +1100,14 @@ void DockingCont::onSize()
::SetWindowPos(((tTbData*)tcItem.lParam)->hClient, NULL, ::SetWindowPos(((tTbData*)tcItem.lParam)->hClient, NULL,
0, 0, rcTemp.right, rcTemp.bottom, 0, 0, rcTemp.right, rcTemp.bottom,
SWP_NOZORDER); SWP_NOZORDER);
::SendMessage(((tTbData*)tcItem.lParam)->hClient, WM_SIZE, 0, MAKELONG(rcTemp.right, rcTemp.bottom)); //::SendMessage(((tTbData*)tcItem.lParam)->hClient, WM_SIZE, 0, MAKELONG(rcTemp.right, rcTemp.bottom));
// Notify switch in
NMHDR nmhdr;
nmhdr.code = DMN_FLOATDROPPED;
nmhdr.hwndFrom = _hSelf;
nmhdr.idFrom = 0;
::SendMessage(((tTbData*)tcItem.lParam)->hClient, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr);
} }
} }
} }

1
PowerEditor/src/WinControls/DockingWnd/dockingResource.h
View File

@ -59,6 +59,7 @@
#define DMN_SWITCHIN (DMN_FIRST + 4) #define DMN_SWITCHIN (DMN_FIRST + 4)
#define DMN_SWITCHOFF (DMN_FIRST + 5) #define DMN_SWITCHOFF (DMN_FIRST + 5)
#define DMN_FLOATDROPPED (DMN_FIRST + 6)
//nmhdr.code = DWORD(DMN_XXX, 0); //nmhdr.code = DWORD(DMN_XXX, 0);
//nmhdr.hwndFrom = DockingCont::_hself; //nmhdr.hwndFrom = DockingCont::_hself;
//nmhdr.idFrom = 0; //nmhdr.idFrom = 0;

77
PowerEditor/src/WinControls/DocumentMap/documentMap.cpp
View File

@ -28,6 +28,7 @@ void DocumentMap::reloadMap()
{ {
Document currentDoc = (*_ppEditView)->execute(SCI_GETDOCPOINTER); Document currentDoc = (*_ppEditView)->execute(SCI_GETDOCPOINTER);
::SendMessage(_pScintillaEditView->getHSelf(), SCI_SETDOCPOINTER, 0, (LPARAM)currentDoc); ::SendMessage(_pScintillaEditView->getHSelf(), SCI_SETDOCPOINTER, 0, (LPARAM)currentDoc);
//_pScintillaEditView->wrap((*_ppEditView)->isWrap());
scrollMap(); scrollMap();
} }
} }
@ -89,6 +90,12 @@ void DocumentMap::scrollMap(bool direction, moveMode whichMode)
scrollMap(); scrollMap();
} }
/*
void DocumentMap::wrapScintilla(bool doWrap)
{
_pScintillaEditView->wrap(doWrap);
}
*/
BOOL CALLBACK DocumentMap::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) BOOL CALLBACK DocumentMap::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
{ {
@ -113,20 +120,7 @@ BOOL CALLBACK DocumentMap::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
_pScintillaEditView->showMargin(3, false); _pScintillaEditView->showMargin(3, false);
_pScintillaEditView->display(); _pScintillaEditView->display();
/*
_glassHandle = ::CreateWindowEx(0,//TEXT("Static"),
TEXT("STATIC"), TEXT("STATIC"),
WS_CHILD | WS_VISIBLE | SS_OWNERDRAW,
0,
0,
100,
100,
_hSelf,
(HMENU) NULL,
::GetModuleHandle(NULL),
NULL);
::ShowWindow(_glassHandle, SW_SHOW);
*/
_vzDlg.init(::GetModuleHandle(NULL), _hSelf); _vzDlg.init(::GetModuleHandle(NULL), _hSelf);
_vzDlg.doDialog(); _vzDlg.doDialog();
(NppParameters::getInstance())->SetTransparent(_vzDlg.getHSelf(), 100); // 0 <= transparancy < 256 (NppParameters::getInstance())->SetTransparent(_vzDlg.getHSelf(), 100); // 0 <= transparancy < 256
@ -138,15 +132,47 @@ BOOL CALLBACK DocumentMap::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
//printStr(TEXT("fw")); //printStr(TEXT("fw"));
} }
return TRUE; return TRUE;
/*
case 2230:
{
if (_pScintillaEditView->isWrap())
{
int width = wParam;
int height = lParam;
int docWrapLineCount = (*_ppEditView)->getCurrentDocWrapLineCount();
int mapWrapLineCount = _pScintillaEditView->getCurrentDocWrapLineCount();
while (mapWrapLineCount != docWrapLineCount)
{
if (mapWrapLineCount < docWrapLineCount)
width--;
else
width++;
::MoveWindow(_pScintillaEditView->getHSelf(), 0, 0, width , height, TRUE);
mapWrapLineCount = _pScintillaEditView->getCurrentDocWrapLineCount();
}
}
}
return TRUE;
*/
case WM_SIZE: case WM_SIZE:
{ {
if (_pScintillaEditView) if (_pScintillaEditView)
{ {
int width = LOWORD(lParam); int width = LOWORD(lParam);
int height = HIWORD(lParam); int height = HIWORD(lParam);
::MoveWindow(_pScintillaEditView->getHSelf(), 0, 0, width , height, TRUE); if (_pScintillaEditView->isWrap())
{
int mapStringWidth = _pScintillaEditView->execute(SCI_TEXTWIDTH, 0, (LPARAM)"aiueolW");
int normalStringWidth = (*_ppEditView)->execute(SCI_TEXTWIDTH, 0, (LPARAM)"aiueolW");
width = ((*_ppEditView)->getWidth())*mapStringWidth/normalStringWidth;
::MoveWindow(_pScintillaEditView->getHSelf(), 0, 0, width , height, TRUE);
}
else
{
::MoveWindow(_pScintillaEditView->getHSelf(), 0, 0, width , height, TRUE);
}
if (_vzDlg.isCreated()) if (_vzDlg.isCreated())
{ {
POINT pt = {0,0}; POINT pt = {0,0};
@ -170,6 +196,7 @@ BOOL CALLBACK DocumentMap::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
case DMN_SWITCHIN: case DMN_SWITCHIN:
{ {
_vzDlg.display(); _vzDlg.display();
reloadMap();
return TRUE; return TRUE;
} }
@ -179,6 +206,21 @@ BOOL CALLBACK DocumentMap::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
return TRUE; return TRUE;
} }
case DMN_FLOATDROPPED:
{
RECT rc;
getClientRect(rc);
int width = rc.right - rc.left;
int height = rc.bottom - rc.top;
POINT pt = {0,0};
::ClientToScreen(_pScintillaEditView->getHSelf(), &pt);
::MoveWindow(_vzDlg.getHSelf(), pt.x, pt.y, width-4, height-4, TRUE);
scrollMap();
return TRUE;
}
case NM_DBLCLK: case NM_DBLCLK:
{ {
return TRUE; return TRUE;
@ -355,7 +397,6 @@ BOOL CALLBACK ViewZoneDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
{ {
int width = LOWORD(lParam); int width = LOWORD(lParam);
int height = HIWORD(lParam); int height = HIWORD(lParam);
//::SetWindowPos(_pScintillaEditView->getHSelf(), _glassHandle, 0, 0, width, height, SWP_SHOWWINDOW);
::MoveWindow(_viewZoneCanvas, 0, 0, width , height, TRUE); ::MoveWindow(_viewZoneCanvas, 0, 0, width , height, TRUE);
} }
break; break;