[BUG_FIXED]Fix caret position moving problem after loading a session.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@363 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
parent
53a52f557d
commit
b8980eda58
@ -380,14 +380,6 @@ void FindReplaceDlg::saveComboHistory(int id, int maxcount, int& oldcount, gener
|
|||||||
|
|
||||||
void FindReplaceDlg::updateCombos()
|
void FindReplaceDlg::updateCombos()
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
bool isUnicode = (*_ppEditView)->getCurrentBuffer()->getUnicodeMode() != uni8Bit;
|
|
||||||
HWND hReplaceCombo = ::GetDlgItem(_hSelf, IDREPLACEWITH);
|
|
||||||
addText2Combo(getTextFromCombo(hReplaceCombo).c_str(), hReplaceCombo, isUnicode);
|
|
||||||
|
|
||||||
HWND hFindCombo = ::GetDlgItem(_hSelf, IDFINDWHAT);
|
|
||||||
addText2Combo(getTextFromCombo(hFindCombo).c_str(), hFindCombo, isUnicode);
|
|
||||||
*/
|
|
||||||
updateCombo(IDREPLACEWITH);
|
updateCombo(IDREPLACEWITH);
|
||||||
updateCombo(IDFINDWHAT);
|
updateCombo(IDFINDWHAT);
|
||||||
}
|
}
|
||||||
|
@ -1134,6 +1134,7 @@ void ScintillaEditView::restoreCurrentPos()
|
|||||||
execute(SCI_SETSCROLLWIDTH, pos._scrollWidth);
|
execute(SCI_SETSCROLLWIDTH, pos._scrollWidth);
|
||||||
execute(SCI_SETXOFFSET, pos._xOffset);
|
execute(SCI_SETXOFFSET, pos._xOffset);
|
||||||
}
|
}
|
||||||
|
execute(SCI_CHOOSECARETX); // choose current x position
|
||||||
|
|
||||||
int lineToShow = execute(SCI_VISIBLEFROMDOCLINE, pos._firstVisibleLine);
|
int lineToShow = execute(SCI_VISIBLEFROMDOCLINE, pos._firstVisibleLine);
|
||||||
scroll(0, lineToShow);
|
scroll(0, lineToShow);
|
||||||
|
Loading…
Reference in New Issue
Block a user