Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SetScrollInfo の呼び出しを抑制 #453

Merged
merged 4 commits into from
Sep 20, 2018
Merged

SetScrollInfo の呼び出しを抑制 #453

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bfcc04
SetScrollInfo の呼び出しを抑制
beru Sep 16, 2018
f24ebf2
レビュー指摘対応
beru Sep 18, 2018
b178891
改行コード修正
beru Sep 19, 2018
494e1cf
レビュー指摘対応
beru Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 49 additions & 19 deletions sakura_core/view/CEditView_Scroll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,43 @@ CLayoutInt CEditView::OnHScroll( int nScrollCode, int nPos )
return nScrollVal;
}

static void setScrollInfoIfNeeded(HWND hWndScrollBar, int nMax, UINT nPage, int nPos)
{
SCROLLINFO siPrev;
siPrev.cbSize = sizeof(siPrev);
siPrev.fMask = SIF_RANGE | SIF_PAGE | SIF_POS;
if (!::GetScrollInfo( hWndScrollBar, SB_CTL, &siPrev )) {
return;
}
// nPage と nPos を範囲内に収める
// https://docs.microsoft.com/en-ca/windows/desktop/api/winuser/nf-winuser-setscrollinfo#remarks
constexpr int nMin = 0;
const UINT nPageMax = (UINT)(nMax - nMin + 1);
if (nPage > nPageMax) {
nPage = nPageMax;
}
if (nPos < nMin) {
nPos = nMin;
}
if (nPos > nMax) {
nPos = nMax;
}
if (siPrev.nMin != 0
|| siPrev.nMax != nMax
|| siPrev.nPage != nPage
|| siPrev.nPos != nPos)
{
SCROLLINFO si;
si.cbSize = sizeof( si );
si.fMask = SIF_ALL | SIF_DISABLENOSCROLL;
si.nMin = 0;
si.nMax = nMax;
si.nPage = nPage;
si.nPos = nPos;
::SetScrollInfo( hWndScrollBar, SB_CTL, &si, TRUE );
}
}

/** スクロールバーの状態を更新する

タブバーのタブ切替時は SIF_DISABLENOSCROLL フラグでの有効化／無効化が正常に動作しない
Expand All @@ -289,9 +326,7 @@ void CEditView::AdjustScrollBars()
return;
}


SCROLLINFO si;
bool bEnable;
bool bEnable;

if( NULL != m_hwndVScrollBar ){
/* 垂直スクロールバー */
Expand All @@ -305,14 +340,12 @@ void CEditView::AdjustScrollBars()
++nVScrollRate;
}
#endif
si.cbSize = sizeof( si );
si.fMask = SIF_ALL | SIF_DISABLENOSCROLL;
si.nMin = 0;
si.nMax = (Int)nAllLines / nVScrollRate - 1; /* 全行数 */
si.nPage = (Int)GetTextArea().m_nViewRowNum / nVScrollRate; /* 表示域の行数 */
si.nPos = (Int)GetTextArea().GetViewTopLine() / nVScrollRate; /* 表示域の一番上の行(0開始) */
si.nTrackPos = 0;
::SetScrollInfo( m_hwndVScrollBar, SB_CTL, &si, TRUE );

setScrollInfoIfNeeded(m_hwndVScrollBar,
(Int)nAllLines / nVScrollRate - 1, /* 全行数 */
(Int)GetTextArea().m_nViewRowNum / nVScrollRate, /* 表示域の行数 */
(Int)GetTextArea().GetViewTopLine() / nVScrollRate /* 表示域の一番上の行(0開始) */
);
m_nVScrollRate = nVScrollRate; /* 垂直スクロールバーの縮尺 */

// Nov. 16, 2002 genta
Expand All @@ -329,14 +362,11 @@ void CEditView::AdjustScrollBars()
}
if( NULL != m_hwndHScrollBar ){
/* 水平スクロールバー */
si.cbSize = sizeof( si );
si.fMask = SIF_ALL | SIF_DISABLENOSCROLL;
si.nMin = 0;
si.nMax = (Int)GetRightEdgeForScrollBar() - 1; // 2009.08.28 nasukoji スクロールバー制御用の右端座標を取得
si.nPage = (Int)GetTextArea().m_nViewColNum; /* 表示域の桁数 */
si.nPos = (Int)GetTextArea().GetViewLeftCol(); /* 表示域の一番左の桁(0開始) */
si.nTrackPos = 1;
::SetScrollInfo( m_hwndHScrollBar, SB_CTL, &si, TRUE );
setScrollInfoIfNeeded(m_hwndHScrollBar,
(Int)GetRightEdgeForScrollBar() - 1, // 2009.08.28 nasukoji スクロールバー制御用の右端座標を取得
(Int)GetTextArea().m_nViewColNum, /* 表示域の桁数 */
(Int)GetTextArea().GetViewLeftCol() /* 表示域の一番左の桁(0開始) */
);

// 2006.1.28 aroka 判定条件誤り修正 (バーが消えてもスクロールしない)
bEnable = ( GetTextArea().m_nViewColNum < GetRightEdgeForScrollBar() );
Expand Down