Merge 2609c41 into b66e259

sakura-editor · Sep 23, 2019 · 32b1681 · 32b1681
2 parents b66e259 + 2609c41
commit 32b1681
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/sakura_core/CSaveAgent.cpp b/sakura_core/CSaveAgent.cpp
@@ -138,7 +138,11 @@ void CSaveAgent::OnAfterSave(const SSaveInfo& sSaveInfo)
 	// 上書き（明示的な上書きや自動保存）では変更しない
 	// ---> 上書きの場合は一時的な折り返し桁変更やタブ幅変更を維持したままにする
 	if(!sSaveInfo.bOverwriteMode){
-		pcDoc->OnChangeSetting();
+		// 文書種別が変更になった場合にのみ設定変更を反映させる
+		int prevIndex = pcDoc->m_cDocType.GetDocumentType().GetIndex();
+		int newIndex = CDocTypeManager().GetDocumentTypeOfPath( sSaveInfo.cFilePath ).GetIndex();
+		if(newIndex != prevIndex)
+			pcDoc->OnChangeSetting();
 	}
 }
 

diff --git a/sakura_core/CWriteManager.cpp b/sakura_core/CWriteManager.cpp
@@ -85,11 +85,16 @@ EConvertResult CWriteManager::WriteFile_From_CDocLineMgr(
 			}
 		}
 		CMemory cmemOutputBuffer;
+		constexpr DWORD userInterfaceInterval = 33;
+		DWORD prevTime = GetTickCount() + userInterfaceInterval;
 		while( pcDocLine ){
 			++nLineNumber;
 
 			//経過通知
-			if(pcDocLineMgr.GetLineCount()>0 && nLineNumber%1024==0){
+			DWORD currTime = GetTickCount();
+			DWORD diffTime = currTime - prevTime;
+			if(diffTime >= userInterfaceInterval){
+				prevTime = currTime;
 				NotifyProgress(nLineNumber * 100 / pcDocLineMgr.GetLineCount());
 				// 処理中のユーザー操作を可能にする
 				if( !::BlockingHook( NULL ) ){