tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] Fix folding margin to be displayed when opening Notepad++ with a new/empty file (Normal text). 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@721 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2010-12-05 02:31:31 +00:00
parent 17331e2ed6
commit 8b5a523e9c
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PowerEditor/src/Notepad_plus.cpp
View File

@ -207,6 +207,8 @@ LRESULT Notepad_plus::init(HWND hwnd)
//Marker Margin config //Marker Margin config
_mainEditView.setMakerStyle(svp1._folderStyle); _mainEditView.setMakerStyle(svp1._folderStyle);
_subEditView.setMakerStyle(svp1._folderStyle); _subEditView.setMakerStyle(svp1._folderStyle);
_mainEditView.defineDocType(_mainEditView.getCurrentBuffer()->getLangType());
_subEditView.defineDocType(_subEditView.getCurrentBuffer()->getLangType());
//Line wrap method //Line wrap method
_mainEditView.setWrapMode(svp1._lineWrapMethod); _mainEditView.setWrapMode(svp1._lineWrapMethod);
@ -1920,12 +1922,9 @@ void Notepad_plus::MaintainIndentation(TCHAR ch)
} }
} }
} }
void Notepad_plus::specialCmd(int id/*, int param*/) void Notepad_plus::specialCmd(int id)
{ {
//if ((param != 1) && (param != 2)) return;
NppParameters *pNppParam = NppParameters::getInstance(); NppParameters *pNppParam = NppParameters::getInstance();
//ScintillaEditView *pEditView = (param == 1)?&_mainEditView:&_subEditView;
switch (id) switch (id)
{ {
@ -1938,15 +1937,7 @@ void Notepad_plus::specialCmd(int id/*, int param*/)
margin = ScintillaEditView::_SC_MARGE_LINENUMBER; margin = ScintillaEditView::_SC_MARGE_LINENUMBER;
else //if (id == IDM_VIEW_SYMBOLMARGIN) else //if (id == IDM_VIEW_SYMBOLMARGIN)
margin = ScintillaEditView::_SC_MARGE_SYBOLE; margin = ScintillaEditView::_SC_MARGE_SYBOLE;
/*
else if (id == IDM_VIEW_DOCCHANGEMARGIN)
{
margin = ScintillaEditView::_SC_MARGE_MODIFMARKER;
}
else
margin = ScintillaEditView::_SC_MARGE_FOLDER;
*/
if (_mainEditView.hasMarginShowed(margin)) if (_mainEditView.hasMarginShowed(margin))
{ {
_mainEditView.showMargin(margin, false); _mainEditView.showMargin(margin, false);

2
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -1717,7 +1717,6 @@ void FindReplaceDlg::findAllIn(InWhat op)
_pFinder->_scintView.execute(SCI_SETCARETLINEVISIBLE, 1); _pFinder->_scintView.execute(SCI_SETCARETLINEVISIBLE, 1);
_pFinder->_scintView.execute(SCI_SETCARETWIDTH, 0); _pFinder->_scintView.execute(SCI_SETCARETWIDTH, 0);
_pFinder->_scintView.showMargin(ScintillaEditView::_SC_MARGE_FOLDER, true); _pFinder->_scintView.showMargin(ScintillaEditView::_SC_MARGE_FOLDER, true);
//_pFinder->_scintView.execute(SCI_SETEOLMODE, SC_EOL_CRLF); // yniq - needed?
// get the width of FindDlg // get the width of FindDlg
RECT findRect; RECT findRect;
@ -1738,7 +1737,6 @@ void FindReplaceDlg::findAllIn(InWhat op)
// Send the address of _MarkingsStruct to the lexer // Send the address of _MarkingsStruct to the lexer
char ptrword[sizeof(void*)*2+1]; char ptrword[sizeof(void*)*2+1];
sprintf(ptrword, "%p", &_pFinder->_MarkingsStruct); sprintf(ptrword, "%p", &_pFinder->_MarkingsStruct);
//_pFinder->_scintView.execute(SCI_SETKEYWORDS, 0, (LPARAM) ptrword);
_pFinder->_scintView.execute(SCI_SETPROPERTY, (WPARAM)"@MarkingsStruct", (LPARAM)ptrword); _pFinder->_scintView.execute(SCI_SETPROPERTY, (WPARAM)"@MarkingsStruct", (LPARAM)ptrword);
} }