Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ENHANCEMENT] Doc map: Improve wrapping operation.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@884 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2012-03-18 23:16:54 +00:00
parent 989a970dd2
commit c1c738348d
1 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,6 @@ sprintf(dchar, "%f", ddd);
// 18 => 11 // 18 => 11
// 19 => 11.5 // 19 => 11.5
// 20 => 12 // 20 => 12
*/ */
double zoomRatio[] = {1, 1, 1, 1, 1.5, 2, 2.5, 2.5, 3.5, 3.5,\ double zoomRatio[] = {1, 1, 1, 1, 1.5, 2, 2.5, 2.5, 3.5, 3.5,\
4, 4.5, 5, 5, 5.5, 6, 6.5, 7, 7, 7.5, 8, 8.5, 8.5, 9.5, 9.5, 10, 10.5, 11, 11, 11.5, 12}; 4, 4.5, 5, 5, 5.5, 6, 6.5, 7, 7, 7.5, 8, 8.5, 8.5, 9.5, 9.5, 10, 10.5, 11, 11, 11.5, 12};
@ -211,20 +210,8 @@ void DocumentMap::scrollMap(bool direction, moveMode whichMode)
// Visible line for the code view // Visible line for the code view
int firstVisibleDisplayLine = (*_ppEditView)->execute(SCI_GETFIRSTVISIBLELINE); int firstVisibleDisplayLine = (*_ppEditView)->execute(SCI_GETFIRSTVISIBLELINE);
int nbLine = (*_ppEditView)->execute(SCI_LINESONSCREEN, firstVisibleDisplayLine); int nbLine = (*_ppEditView)->execute(SCI_LINESONSCREEN, firstVisibleDisplayLine);
int lastVisibleDisplayLine = firstVisibleDisplayLine + nbLine;
int nbLine2go = (whichMode == perLine?1:nbLine); int nbLine2go = (whichMode == perLine?1:nbLine);
int line2go = 1; (*_ppEditView)->execute(SCI_LINESCROLL, 0, (direction == moveDown)?nbLine2go:-nbLine2go);
if (direction == moveDown)
{
line2go = (*_ppEditView)->execute(SCI_DOCLINEFROMVISIBLE, lastVisibleDisplayLine + nbLine2go);
}
else
{
line2go = (*_ppEditView)->execute(SCI_DOCLINEFROMVISIBLE, firstVisibleDisplayLine - nbLine2go);
}
(*_ppEditView)->execute(SCI_GOTOLINE, line2go);
scrollMap(); scrollMap();
} }
@ -351,35 +338,12 @@ BOOL CALLBACK DocumentMap::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
{ {
int newPosY = HIWORD(lParam); int newPosY = HIWORD(lParam);
int currentCenterPosY = _vzDlg.getCurrentCenterPosY(); int currentCenterPosY = _vzDlg.getCurrentCenterPosY();
//int currentHeight = _vzDlg.getViewerHeight();
bool dir = (newPosY < currentCenterPosY)?moveUp:moveDown;
int pixelPerLine = _pScintillaEditView->execute(SCI_TEXTHEIGHT, 0); int pixelPerLine = _pScintillaEditView->execute(SCI_TEXTHEIGHT, 0);
int jumpDistance = newPosY - currentCenterPosY;
int jumpDistance;
if (dir == moveUp)
{
jumpDistance = currentCenterPosY - newPosY;
int nbLine2jump = jumpDistance/pixelPerLine; int nbLine2jump = jumpDistance/pixelPerLine;
int firstVisibleDisplayLine = (*_ppEditView)->execute(SCI_GETFIRSTVISIBLELINE); (*_ppEditView)->execute(SCI_LINESCROLL, 0, nbLine2jump);
firstVisibleDisplayLine -= nbLine2jump;
if (firstVisibleDisplayLine < 0)
firstVisibleDisplayLine = 0;
(*_ppEditView)->execute(SCI_GOTOLINE, (*_ppEditView)->execute(SCI_DOCLINEFROMVISIBLE, firstVisibleDisplayLine));
}
else
{
jumpDistance = newPosY - currentCenterPosY;
int nbLine2jump = jumpDistance/pixelPerLine;
int firstVisibleDisplayLine = (*_ppEditView)->execute(SCI_GETFIRSTVISIBLELINE);
int nbLine = (*_ppEditView)->execute(SCI_LINESONSCREEN, firstVisibleDisplayLine);
int lastVisibleDisplayLine = firstVisibleDisplayLine + nbLine;
lastVisibleDisplayLine += nbLine2jump;
(*_ppEditView)->execute(SCI_GOTOLINE, (*_ppEditView)->execute(SCI_DOCLINEFROMVISIBLE, lastVisibleDisplayLine));
}
scrollMap(); scrollMap();
} }
return TRUE; return TRUE;