Merge pull request #1411 from beru/CGraphics_SaveDC_RestoreDC

CGraphics 関連の最適化
sakura-editor · Sep 27, 2020 · 470a1ff · 470a1ff
2 parents 120a20c + ad4537a
commit 470a1ff
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 21 deletions.
diff --git a/sakura_core/view/CEditView.h b/sakura_core/view/CEditView.h
@@ -240,8 +240,7 @@ class CEditView
 protected:
 	//! ロジック行を1行描画
 	bool DrawLogicLine(
-		HDC				hdc,			//!< [in]     作画対象
-		DispPos*		pDispPos,		//!< [in,out] 描画する箇所、描画元ソース
+		SColorStrategyInfo* pInfo,		//!< [in,out] 作画情報
 		CLayoutInt		nLineTo			//!< [in]     作画終了するレイアウト行番号
 	);
 

diff --git a/sakura_core/view/CEditView_Paint.cpp b/sakura_core/view/CEditView_Paint.cpp
@@ -779,15 +779,17 @@ void CEditView::OnPaint2( HDC _hdc, PAINTSTRUCT *pPs, BOOL bDrawFromComptibleBmp
 			sPos.ForwardLayoutLineRef(1);	//レイアウト行＋＋
 		}
 	}else{
+		SColorStrategyInfo sInfo(gr);
+		sInfo.m_pDispPos = &sPos;
+		sInfo.m_pcView = this;
 		while(sPos.GetLayoutLineRef() <= nLayoutLineTo)
 		{
 			//描画X位置リセット
 			sPos.ResetDrawCol();
 
 			//1行描画
 			bool bDispResult = DrawLogicLine(
-				gr,
-				&sPos,
+				&sInfo,
 				nLayoutLineTo
 			);
 
@@ -871,18 +873,12 @@ void CEditView::OnPaint2( HDC _hdc, PAINTSTRUCT *pPs, BOOL bDrawFromComptibleBmp
 	@date 2007.08.31 kobake 引数 bDispBkBitmap を削除
 */
 bool CEditView::DrawLogicLine(
-	HDC				_hdc,			//!< [in]     作画対象
-	DispPos*		_pDispPos,		//!< [in,out] 描画する箇所、描画元ソース
+	SColorStrategyInfo* pInfo,		//!< [in,out] 作画情報
 	CLayoutInt		nLineTo			//!< [in]     作画終了するレイアウト行番号
 )
 {
 //	MY_RUNNINGTIMER( cRunningTimer, "CEditView::DrawLogicLine" );
 	bool bDispEOF = false;
-	SColorStrategyInfo _sInfo;
-	SColorStrategyInfo* pInfo = &_sInfo;
-	pInfo->m_gr.Init(_hdc);
-	pInfo->m_pDispPos = _pDispPos;
-	pInfo->m_pcView = this;
 
 	//CColorStrategyPool初期化
 	CColorStrategyPool* pool = CColorStrategyPool::getInstance();

diff --git a/sakura_core/view/CEditView_Paint_Bracket.cpp b/sakura_core/view/CEditView_Paint_Bracket.cpp
@@ -125,8 +125,7 @@ void CEditView::DrawBracketPair( bool bDraw )
 		return;
 	}
 
-	CGraphics gr;
-	gr.Init(::GetDC(GetHwnd()));
+	CGraphics gr(::GetDC(GetHwnd()));
 	bool bCaretChange = false;
 	gr.SetTextBackTransparent(true);
 

diff --git a/sakura_core/view/colors/CColorStrategy.h b/sakura_core/view/colors/CColorStrategy.h
@@ -87,7 +87,14 @@ struct CColor3Setting {
 };
 
 struct SColorStrategyInfo{
-	SColorStrategyInfo() : m_sDispPosBegin(0,0), m_pStrategy(NULL), m_pStrategyFound(NULL), m_pStrategySelect(NULL), m_colorIdxBackLine(COLORIDX_TEXT) {
+	SColorStrategyInfo(HDC hDC = NULL)
+		: m_sDispPosBegin(0,0)
+		, m_pStrategy(NULL)
+		, m_pStrategyFound(NULL)
+		, m_pStrategySelect(NULL)
+		, m_colorIdxBackLine(COLORIDX_TEXT)
+		, m_gr(hDC)
+	{
 		m_cIndex.eColorIndex = COLORIDX_TEXT;
 		m_cIndex.eColorIndex2 = COLORIDX_TEXT;
 		m_cIndex.eColorIndexBg = COLORIDX_TEXT;

diff --git a/sakura_core/view/figures/CFigure_Eol.cpp b/sakura_core/view/figures/CFigure_Eol.cpp
@@ -44,7 +44,7 @@ void _DispWrap(CGraphics& gr, DispPos* pDispPos, const CEditView* pcView);
 
 //改行記号描画
 //2007.08.30 kobake 追加
-void _DispEOL(CGraphics& gr, DispPos* pDispPos, CEol cEol, const CEditView* pcView, bool bTrans);
+void _DispEOL(CGraphics& gr, DispPos* pDispPos, CEol cEol, const CEditView* pcView, bool bTrans, HPEN hPen);
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
 //                        CFigure_Eol                            //
@@ -113,7 +113,16 @@ bool CFigure_Eol::DrawImp(SColorStrategyInfo* pInfo)
 		pInfo->m_gr.PushMyFont(sFont);
 
 		DispPos sPos(*pInfo->m_pDispPos);	// 現在位置を覚えておく
-		_DispEOL(pInfo->m_gr, pInfo->m_pDispPos, cEol, pcView, bTrans);
+
+		if (crText != m_clrPen || m_hPen == NULL) {
+			if (m_hPen != NULL) {
+				::DeleteObject(m_hPen);
+			}
+			m_hPen = CreatePen(PS_SOLID, 1, crText);
+			m_clrPen = crText;
+		}
+
+		_DispEOL(pInfo->m_gr, pInfo->m_pDispPos, cEol, pcView, bTrans, m_hPen);
 		DrawImp_StylePop(pInfo);
 		DrawImp_DrawUnderline(pInfo, sPos);
 
@@ -252,11 +261,11 @@ void _DrawEOL(
 	const CMyRect&	rcEol,
 	CEol			cEol,
 	bool			bBold,
-	COLORREF		pColor
+	HPEN			hPen
 );
 
 //2007.08.30 kobake 追加
-void _DispEOL(CGraphics& gr, DispPos* pDispPos, CEol cEol, const CEditView* pcView, bool bTrans)
+void _DispEOL(CGraphics& gr, DispPos* pDispPos, CEol cEol, const CEditView* pcView, bool bTrans, HPEN hPen)
 {
 	const CLayoutXInt nCol = CTypeSupport(pcView,COLORIDX_EOL).IsDisp()
 		? pcView->GetTextMetrics().GetLayoutXDefault(CKetaXInt(1)) + CLayoutXInt(4) // ONのときは1幅+4px
@@ -293,7 +302,7 @@ void _DispEOL(CGraphics& gr, DispPos* pDispPos, CEol cEol, const CEditView* pcVi
 			// 文字色や太字かどうかを現在の DC から調べる	// 2009.05.29 ryoji 
 			// （検索マッチ等の状況に柔軟に対応するため、ここは記号の色指定には決め打ちしない）
 			// 2013.06.21 novice 文字色、太字をCGraphicsから取得
-			_DrawEOL(gr, rcEol, cEol, gr.GetCurrentMyFontBold(), gr.GetCurrentTextForeColor());
+			_DrawEOL(gr, rcEol, cEol, gr.GetCurrentMyFontBold(), hPen);
 
 			// リージョン破棄
 			gr.PopClipping();
@@ -322,11 +331,11 @@ void _DrawEOL(
 	const CMyRect&	rcEol,		//!< 描画領域
 	CEol			cEol,		//!< 行末コード種別
 	bool			bBold,		//!< TRUE: 太字
-	COLORREF		pColor		//!< 色
+	HPEN			hPen		//!< ペン
 )
 {
 	int sx, sy;	//	矢印の先頭
-	gr.SetPen( pColor );
+	HPEN hPenOld = (HPEN)SelectObject(gr, hPen);
 
 	switch( cEol.GetType() ){
 	case EOL_CRLF:	//	下左矢印
@@ -471,4 +480,6 @@ void _DrawEOL(
 		}
 		break;
 	}
+
+	SelectObject(gr, hPenOld);
 }
diff --git a/sakura_core/view/figures/CFigure_Eol.h b/sakura_core/view/figures/CFigure_Eol.h
@@ -31,6 +31,12 @@
 //! 改行描画
 class CFigure_Eol : public CFigureSpace{
 public:
+	~CFigure_Eol()
+	{
+		if (m_hPen) {
+			::DeleteObject(m_hPen);
+		}
+	}
 	//traits
 	bool Match(const wchar_t* pText, int nTextLen) const;
 	bool Disp(void) const
@@ -42,5 +48,8 @@ class CFigure_Eol : public CFigureSpace{
 	bool DrawImp(SColorStrategyInfo* pInfo);
 	void DispSpace(CGraphics& gr, DispPos* pDispPos, CEditView* pcView, bool bTrans) const {};
 	EColorIndexType GetColorIdx(void) const{ return COLORIDX_EOL; }
+private:
+	HPEN m_hPen = NULL;
+	COLORREF m_clrPen;
 };
 #endif /* SAKURA_CFIGURE_EOL_C51A4502_29AE_4D38_8056_5B0CFCC3686B_H_ */