[ENHANCEMENT] Doc map: Improve wrapping operation.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@882 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2012-03-14 20:47:01 +00:00
parent e05b1ad828
commit 671e7b1b4d
3 changed files with 9 additions and 22 deletions

View File

@ -4795,18 +4795,21 @@ void Notepad_plus::launchDocMap()
data.dlgID = IDM_VIEW_DOC_MAP; data.dlgID = IDM_VIEW_DOC_MAP;
::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, (LPARAM)&data); ::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, (LPARAM)&data);
_pDocMap->setMainEditorWrap(_pEditView->isWrap()); //_pDocMap->setMainEditorWrap(_pEditView->isWrap());
} }
else else
{ {
/*
// Disable wrap text // Disable wrap text
if (!_pDocMap->isVisible()) if (!_pDocMap->isVisible())
{ {
_pDocMap->setMainEditorWrap(_pEditView->isWrap()); _pDocMap->setMainEditorWrap(_pEditView->isWrap());
} }
*/
} }
//_mainEditView.wrap(false);
//_subEditView.wrap(false); _pDocMap->initWrapMap();
_pDocMap->wrapMap();
_pDocMap->display(); _pDocMap->display();
} }

View File

@ -72,18 +72,7 @@ void DocumentMap::initWrapMap()
_pScintillaEditView->redraw(true); _pScintillaEditView->redraw(true);
} }
} }
/*
void DocumentMap::guiUpdate()
{
//if (_wrapUnwrapTriggered)
{
//initWrapMap();
}
_wrapUnwrapTriggered = false;
}
*/
/* /*
double ddd = (double)Xlength1/(double)Xlength2; double ddd = (double)Xlength1/(double)Xlength2;
char dchar[256]; char dchar[256];

View File

@ -108,19 +108,14 @@ public:
void scrollMap(bool direction, moveMode whichMode); void scrollMap(bool direction, moveMode whichMode);
void doMove(); void doMove();
void fold(int line, bool foldOrNot); void fold(int line, bool foldOrNot);
/*
void setMainEditorWrap(bool isWrap) { void setMainEditorWrap(bool isWrap) {
_isMainEditorWrap = isWrap; _isMainEditorWrap = isWrap;
}; };
bool isMainEditorWrap() const { bool isMainEditorWrap() const {
return _isMainEditorWrap; return _isMainEditorWrap;
}; };
/*
void wrapActionDone() {
_wrapUnwrapTriggered = true;
};
*/ */
//void guiUpdate();
protected: protected:
virtual BOOL CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); virtual BOOL CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
@ -132,7 +127,7 @@ private:
ScintillaEditView *_pScintillaEditView; ScintillaEditView *_pScintillaEditView;
//HWND _glassHandle; //HWND _glassHandle;
ViewZoneDlg _vzDlg; ViewZoneDlg _vzDlg;
bool _isMainEditorWrap; //bool _isMainEditorWrap;
//bool _wrapUnwrapTriggered; //bool _wrapUnwrapTriggered;
// for needToRecomputeWith function // for needToRecomputeWith function