From b8980eda5813f305ff49f0dc3675fe7a705cae8e Mon Sep 17 00:00:00 2001 From: donho Date: Sun, 7 Dec 2008 18:21:58 +0000 Subject: [PATCH] [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 --- PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp | 8 -------- PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index c1ff2191e..de0fc02ed 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -380,14 +380,6 @@ void FindReplaceDlg::saveComboHistory(int id, int maxcount, int& oldcount, gener 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(IDFINDWHAT); } diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index 8493cb98d..f2f168f7e 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -1134,6 +1134,7 @@ void ScintillaEditView::restoreCurrentPos() execute(SCI_SETSCROLLWIDTH, pos._scrollWidth); execute(SCI_SETXOFFSET, pos._xOffset); } + execute(SCI_CHOOSECARETX); // choose current x position int lineToShow = execute(SCI_VISIBLEFROMDOCLINE, pos._firstVisibleLine); scroll(0, lineToShow);