From 4f93674cc910dea7fc110029e3a8919c3a04d597 Mon Sep 17 00:00:00 2001 From: katsuhisa yuasa Date: Sun, 11 Apr 2021 13:35:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=97=E5=88=A5?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=AE=E3=80=8C=E3=82=AB=E3=83=BC=E3=82=BD?= =?UTF-8?q?=E3=83=AB=E4=BD=8D=E7=BD=AE=E7=B8=A6=E7=B7=9A=E3=80=8D=E3=82=92?= =?UTF-8?q?=E6=9C=89=E5=8A=B9=E6=99=82=E3=81=AB=E3=80=81=E3=82=AB=E3=83=BC?= =?UTF-8?q?=E3=82=BD=E3=83=AB=E3=81=8C=E5=85=88=E9=A0=AD=E8=A1=8C=E3=81=AB?= =?UTF-8?q?=E3=81=82=E3=82=8B=E7=8A=B6=E6=85=8B=E3=81=A7=20PageUp=20?= =?UTF-8?q?=E3=82=AD=E3=83=BC=E3=82=92=E6=8A=BC=E3=81=97=E3=81=9F=E5=BE=8C?= =?UTF-8?q?=E3=81=AB=E3=82=AB=E3=83=BC=E3=82=BD=E3=83=AB=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=E7=A7=BB=E5=8B=95=E3=81=99=E3=82=8B=E3=81=A8=E3=82=AB=E3=83=BC?= =?UTF-8?q?=E3=82=BD=E3=83=AB=E4=BD=8D=E7=BD=AE=E7=B8=A6=E7=B7=9A=E3=81=8C?= =?UTF-8?q?=E6=AE=8B=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=20=E3=82=AB=E3=83=BC=E3=82=BD=E3=83=AB=E3=81=8C=E6=9C=80?= =?UTF-8?q?=E7=B5=82=E8=A1=8C=E6=99=82=E3=81=AE=20PageDown=20=E3=82=AD?= =?UTF-8?q?=E3=83=BC=E5=BE=8C=E3=81=AE=E3=82=AB=E3=83=BC=E3=82=BD=E3=83=AB?= =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=A7=BB=E5=8B=95=E3=81=AB=E3=81=A4=E3=81=84?= =?UTF-8?q?=E3=81=A6=E3=82=82=E5=90=8C=E6=A7=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/cmd/CViewCommander_Cursor.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sakura_core/cmd/CViewCommander_Cursor.cpp b/sakura_core/cmd/CViewCommander_Cursor.cpp index 6143b870a5..9096e95299 100644 --- a/sakura_core/cmd/CViewCommander_Cursor.cpp +++ b/sakura_core/cmd/CViewCommander_Cursor.cpp @@ -745,13 +745,15 @@ void CViewCommander::Command_1PageUp( bool bSelect, CLayoutYInt nScrollNum ) } auto& caret = GetCaret(); auto prevCaretPos = caret.GetCaretLayoutPos(); + bool bCursorVLine = m_pCommanderView->m_pTypeData->m_ColorInfoArr[COLORIDX_CURSORVLINE].m_bDisp; caret.Cursor_UPDOWN( -nScrollNum, bSelect ); auto currCaretPos = caret.GetCaretLayoutPos(); CLayoutInt nScrolled = m_pCommanderView->ScrollAtV( nViewTopLine - nScrollNum ); m_pCommanderView->SyncScrollV(nScrolled); m_pCommanderView->SetDrawSwitch(bDrawSwitchOld); // カーソル位置が変化しなかった、かつ、スクロール行数が0だった場合、描画を省く - if (prevCaretPos == currCaretPos && nScrolled == 0) { + // タイプ別設定の「カーソル位置縦線」有効時には省かない + if (!bCursorVLine && prevCaretPos == currCaretPos && nScrolled == 0) { return; } m_pCommanderView->RedrawAll(); @@ -780,13 +782,15 @@ void CViewCommander::Command_1PageDown( bool bSelect, CLayoutYInt nScrollNum ) } auto& caret = GetCaret(); auto prevCaretPos = caret.GetCaretLayoutPos(); + bool bCursorVLine = m_pCommanderView->m_pTypeData->m_ColorInfoArr[COLORIDX_CURSORVLINE].m_bDisp; caret.Cursor_UPDOWN( nScrollNum, bSelect ); auto currCaretPos = caret.GetCaretLayoutPos(); CLayoutInt nScrolled = m_pCommanderView->ScrollAtV( nViewTopLine + nScrollNum ); m_pCommanderView->SyncScrollV(nScrolled); m_pCommanderView->SetDrawSwitch(bDrawSwitchOld); // カーソル位置が変化しなかった、かつ、スクロール行数が0だった場合、描画を省く - if (prevCaretPos == currCaretPos && nScrolled == 0) { + // タイプ別設定の「カーソル位置縦線」有効時には省かない + if (!bCursorVLine && prevCaretPos == currCaretPos && nScrolled == 0) { return; } m_pCommanderView->RedrawAll(); From af457d3347b5679af5fbec09ce230f845c672fee Mon Sep 17 00:00:00 2001 From: katsuhisa yuasa Date: Sun, 11 Apr 2021 19:30:17 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/cmd/CViewCommander_Cursor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sakura_core/cmd/CViewCommander_Cursor.cpp b/sakura_core/cmd/CViewCommander_Cursor.cpp index 9096e95299..2f0ea2a32d 100644 --- a/sakura_core/cmd/CViewCommander_Cursor.cpp +++ b/sakura_core/cmd/CViewCommander_Cursor.cpp @@ -745,7 +745,7 @@ void CViewCommander::Command_1PageUp( bool bSelect, CLayoutYInt nScrollNum ) } auto& caret = GetCaret(); auto prevCaretPos = caret.GetCaretLayoutPos(); - bool bCursorVLine = m_pCommanderView->m_pTypeData->m_ColorInfoArr[COLORIDX_CURSORVLINE].m_bDisp; + bool bNoDispCursorVLine = m_pCommanderView->m_pTypeData->m_ColorInfoArr[COLORIDX_CURSORVLINE].m_bDisp == false; caret.Cursor_UPDOWN( -nScrollNum, bSelect ); auto currCaretPos = caret.GetCaretLayoutPos(); CLayoutInt nScrolled = m_pCommanderView->ScrollAtV( nViewTopLine - nScrollNum ); @@ -753,7 +753,7 @@ void CViewCommander::Command_1PageUp( bool bSelect, CLayoutYInt nScrollNum ) m_pCommanderView->SetDrawSwitch(bDrawSwitchOld); // カーソル位置が変化しなかった、かつ、スクロール行数が0だった場合、描画を省く // タイプ別設定の「カーソル位置縦線」有効時には省かない - if (!bCursorVLine && prevCaretPos == currCaretPos && nScrolled == 0) { + if (bNoDispCursorVLine && prevCaretPos == currCaretPos && nScrolled == 0) { return; } m_pCommanderView->RedrawAll(); @@ -782,7 +782,7 @@ void CViewCommander::Command_1PageDown( bool bSelect, CLayoutYInt nScrollNum ) } auto& caret = GetCaret(); auto prevCaretPos = caret.GetCaretLayoutPos(); - bool bCursorVLine = m_pCommanderView->m_pTypeData->m_ColorInfoArr[COLORIDX_CURSORVLINE].m_bDisp; + bool bNoDispCursorVLine = m_pCommanderView->m_pTypeData->m_ColorInfoArr[COLORIDX_CURSORVLINE].m_bDisp == false; caret.Cursor_UPDOWN( nScrollNum, bSelect ); auto currCaretPos = caret.GetCaretLayoutPos(); CLayoutInt nScrolled = m_pCommanderView->ScrollAtV( nViewTopLine + nScrollNum ); @@ -790,7 +790,7 @@ void CViewCommander::Command_1PageDown( bool bSelect, CLayoutYInt nScrollNum ) m_pCommanderView->SetDrawSwitch(bDrawSwitchOld); // カーソル位置が変化しなかった、かつ、スクロール行数が0だった場合、描画を省く // タイプ別設定の「カーソル位置縦線」有効時には省かない - if (!bCursorVLine && prevCaretPos == currCaretPos && nScrolled == 0) { + if (bNoDispCursorVLine && prevCaretPos == currCaretPos && nScrolled == 0) { return; } m_pCommanderView->RedrawAll();