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

[BUG_FIXED] Fix folding bugs while deleting the begin/end folding keywords.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@126 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2008-02-10 23:27:55 +00:00
parent 53f1dbfc19
commit fd383d3b55
4 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
PowerEditor/src/Notepad_plus.cpp
View File

@ -1549,6 +1549,11 @@ BOOL Notepad_plus::notify(SCNotification *notification)
_isDocModifing = true;
::InvalidateRect(_pEditView->getHSelf(), NULL, TRUE);
}
if (notification->modificationType & SC_MOD_CHANGEFOLD)
{
_pEditView->foldChanged(notification->line,
notification->foldLevelNow, notification->foldLevelPrev);
}
}
break;
@ -1986,7 +1991,19 @@ BOOL Notepad_plus::notify(SCNotification *notification)
_isHotspotDblClicked = true;
_pEditView->execute(SCI_SETCHARSDEFAULT);
break;
}
}
case SCN_NEEDSHOWN :
{
int begin = _pEditView->execute(SCI_LINEFROMPOSITION, notification->position);
int end = _pEditView->execute(SCI_LINEFROMPOSITION, notification->position + notification->length);
int firstLine = begin < end ? begin : end;
int lastLine = begin > end ? begin : end;
for (int line = firstLine; line <= lastLine; line++) {
_pEditView->execute(SCI_ENSUREVISIBLE, line, 0);
}
break;
}
default :
break;

9
PowerEditor/src/Notepad_plus.h
View File

@ -660,9 +660,12 @@ private:
void checkLangsMenu(int id) const ;
void setLanguage(int id, LangType langType) {
_pEditView->setCurrentDocType(langType);
setLangStatus(langType);
checkLangsMenu(id);
if (_pEditView->setCurrentDocType(langType))
{
_pEditView->foldAll(fold_uncollapse);
setLangStatus(langType);
checkLangsMenu(id);
}
};
int getToolBarState() const {

33
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -1723,4 +1723,35 @@ void ScintillaEditView::recalcHorizontalScrollbar()
int currentLength = execute(SCI_GETSCROLLWIDTH); //Get current scrollbar size
if (currentLength != maxPixel) //And if it is not the same
execute(SCI_SETSCROLLWIDTH, maxPixel); //update it
}
}
void ScintillaEditView::foldChanged(int line, int levelNow, int levelPrev)
{
if (levelNow & SC_FOLDLEVELHEADERFLAG)
{
if (!(levelPrev & SC_FOLDLEVELHEADERFLAG))
{
// Adding a fold point.
execute(SCI_SETFOLDEXPANDED, line, 1);
expand(line, true, false, 0, levelPrev);
}
}
else if (levelPrev & SC_FOLDLEVELHEADERFLAG)
{
if (!execute(SCI_GETFOLDEXPANDED, line))
{
// Removing the fold from one that has been contracted so should expand
// otherwise lines are left invisible with no way to make them visible
execute(SCI_SETFOLDEXPANDED, line, 1);
expand(line, true, false, 0, levelPrev);
}
}
else if (!(levelNow & SC_FOLDLEVELWHITEFLAG) &&
((levelPrev & SC_FOLDLEVELNUMBERMASK) > (levelNow & SC_FOLDLEVELNUMBERMASK)))
{
// See if should still be hidden
int parentLine = execute(SCI_GETFOLDPARENT, line);
if ((parentLine < 0) || (execute(SCI_GETFOLDEXPANDED, parentLine) && execute(SCI_GETLINEVISIBLE, parentLine)))
execute(SCI_SHOWLINES, line, line);
}
}

9
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
View File

@ -151,14 +151,15 @@ public:
void defineDocType(LangType typeDoc);
void setCurrentDocType(LangType typeDoc) {
bool setCurrentDocType(LangType typeDoc) {
if ((_buffers[_currentIndex]._lang == typeDoc) && (typeDoc != L_USER))
return;
return false;
if (typeDoc == L_USER)
_buffers[_currentIndex]._userLangExt[0] = '\0';
_buffers[_currentIndex]._lang = typeDoc;
defineDocType(typeDoc);
return true;
};
void setCurrentDocUserType(const char *userLangName) {
@ -591,7 +592,9 @@ public:
void columnReplace(const ColumnModeInfo & cmi, const char ch);
void columnReplace(ColumnModeInfo & cmi, int initial, int incr, unsigned char format);
void ScintillaEditView::recalcHorizontalScrollbar();
void recalcHorizontalScrollbar();
void foldChanged(int line, int levelNow, int levelPrev);
protected:
static HINSTANCE _hLib;
static int _refCount;