Fix: プロポーショナルフォント

[patchunicode:#713] git-svn-id: https://svn.code.sf.net/p/sakura-editor/code/sakura/trunk2@4065 f7ce1907-e4c7-47ca-9f76-12c87ed2c91c
sakura-editor · Dec 28, 2015 · 8d65af4 · 8d65af4
1 parent 4ac6b6b
commit 8d65af4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp
@@ -1827,6 +1827,8 @@ LRESULT CEditWnd::DispatchEvent(
 			break;
 		case PM_CHANGESETTING_FONT:
 			GetDocument()->OnChangeSetting( true );	// フォントで文字幅が変わるので、レイアウト再構築
+			delete [] m_posSaveAry;
+			m_posSaveAry = NULL;
 			break;
 		case PM_CHANGESETTING_FONTSIZE:
 			if( (-1 == wParam && CWM_CACHE_SHARE == GetLogfontCacheMode())
@@ -1862,9 +1864,6 @@ LRESULT CEditWnd::DispatchEvent(
 					::SetFocus( GetActiveView().GetHwnd() );	// フォーカスを戻す
 			}
 			break;
-			delete [] m_posSaveAry;
-			m_posSaveAry = NULL;
-			break;
 		case PM_CHANGESETTING_TYPE2:
 			cTypeNew = CDocTypeManager().GetDocumentTypeOfPath(GetDocument()->m_cDocFile.GetFilePath());
 			if (GetDocument()->m_cDocType.GetDocumentType().GetIndex() == wParam

diff --git a/sakura_core/window/CEditWnd.h b/sakura_core/window/CEditWnd.h
@@ -404,7 +404,7 @@ class CEditWnd
 	LPTSTR			m_pszMenubarMessage; //!< メニューバー右端に表示するメッセージ
 public:
 	int				m_nTimerCount;		//!< OnTimer用 2003.08.29 wmlhq
-	CLogicPointEx*	m_posSaveAry;
+	CLogicPointEx*	m_posSaveAry;		//!< フォント変更前の座標
 private:
 	int				m_nCurrentFocus;	//!< 現在のフォーカス情報
 	int				m_nWinSizeType;		//!< サイズ変更のタイプ。SIZE_MAXIMIZED, SIZE_MINIMIZED 等。