From d04e47cc94da28485c4abff4e10f733049b08a4e Mon Sep 17 00:00:00 2001 From: Dennis Lim Date: Wed, 7 Nov 2001 12:44:24 +0000 Subject: [PATCH] fix the tabs --- Src/MainFrm.cpp | 3 +++ Src/MergeDoc.cpp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 050db217e..d5893e9e1 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -271,6 +271,9 @@ void CMainFrame::ShowMergeDoc(LPCTSTR szLeft, LPCTSTR szRight) split_filename(szRight, NULL, name, ext); m_pRight->SetTextType(ext); + // SetTextType will revert to language dependent defaults for tab + m_pLeft->SetTabSize(mf->m_nTabSize); + m_pRight->SetTabSize(mf->m_nTabSize); // set the frame window header CChildFrame *pf = static_cast(m_pMergeDoc->m_pView->GetParentFrame()); diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index c1062ac2f..1b5e52d72 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -380,6 +380,10 @@ BOOL CMergeDoc::Rescan() mf->m_pLeft->PrimeListWithFile(m_strTempLeftFile); mf->m_pRight->PrimeListWithFile(m_strTempRightFile); + // PrimeListWithFile will call resetview which resets tabs + mf->m_pLeft->SetTabSize(mf->m_nTabSize); + mf->m_pRight->SetTabSize(mf->m_nTabSize); + int lcnt = mf->m_pLeft->GetLineCount(); int rcnt = mf->m_pRight->GetLineCount(); /*TODO: if (lcnt < rcnt) -- 2.11.0