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

サイズボックスウィンドウをその都度作り直すのではなく表示・非表示を切り替えて使いまわす #695

Merged
merged 2 commits into from
Dec 16, 2018
Merged

サイズボックスウィンドウをその都度作り直すのではなく表示・非表示を切り替えて使いまわす #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4149bbb
サイズボックスウィンドウをその都度作り直すのではなく表示・非表示を切り替えて使いまわす
beru Dec 11, 2018
ea14a30
レビュー指摘対応
beru Dec 16, 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
90 changes: 45 additions & 45 deletions sakura_core/view/CEditView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ BOOL CEditView::Create(
m_nVScrollRate = 1; /* 垂直スクロールバーの縮尺 */
m_hwndHScrollBar = NULL;
m_hwndSizeBox = NULL;
m_hwndSizeBoxPlaceholder = NULL;

m_ptSrchStartPos_PHY.Set(CLogicInt(-1), CLogicInt(-1)); //検索/置換開始時のカーソル位置 (改行単位行先頭からのバイト数(0開始), 改行単位行の行番号(0開始))
m_bSearch = FALSE; // 検索/置換開始位置を登録するか */ // 02/06/26 ai
Expand Down Expand Up @@ -468,7 +469,40 @@ LRESULT CEditView::DispatchEvent(

case WM_CREATE:
::SetWindowLongPtr( hwnd, 0, (LONG_PTR) this );

m_hwndSizeBox = ::CreateWindowEx(
0L, /* no extended styles */
_T("SCROLLBAR"), /* scroll bar control class */
NULL, /* text for window title bar */
WS_CHILD | SBS_SIZEBOX | SBS_SIZEGRIP, /* scroll bar styles */
0, /* horizontal position */
0, /* vertical position */
200, /* width of the scroll bar */
CW_USEDEFAULT, /* default height */
hwnd, /* handle of main window */
(HMENU) NULL, /* no menu for a scroll bar */
((CREATESTRUCT*)lParam)->hInstance, /* instance owning this window */
(LPVOID) NULL /* pointer not needed */
);
berryzplus marked this conversation as resolved.
Show resolved Hide resolved
if (m_hwndSizeBox == NULL) {
return -1;
}
m_hwndSizeBoxPlaceholder = ::CreateWindowEx(
0L, /* no extended styles */
berryzplus marked this conversation as resolved.
Show resolved Hide resolved
_T("STATIC"), /* scroll bar control class */
NULL, /* text for window title bar */
WS_CHILD, /* innocent child */
0, /* horizontal position */
0, /* vertical position */
200, /* width of the scroll bar */
CW_USEDEFAULT, /* default height */
hwnd, /* handle of main window */
(HMENU) NULL, /* no menu for a scroll bar */
((CREATESTRUCT*)lParam)->hInstance, /* instance owning this window */
(LPVOID) NULL /* pointer not needed */
);
berryzplus marked this conversation as resolved.
Show resolved Hide resolved
if (m_hwndSizeBoxPlaceholder == NULL) {
return -1;
}
return 0L;

// From Here 2007.09.09 Moca 互換BMPによる画面バッファ
Expand Down Expand Up @@ -800,10 +834,10 @@ LRESULT CEditView::DispatchEvent(
::DestroyWindow( m_hwndHScrollBar );
m_hwndHScrollBar = NULL;
}
if( NULL != m_hwndSizeBox ){
::DestroyWindow( m_hwndSizeBox );
m_hwndSizeBox = NULL;
}
::DestroyWindow( m_hwndSizeBox );
m_hwndSizeBox = NULL;
::DestroyWindow( m_hwndSizeBoxPlaceholder );
m_hwndSizeBoxPlaceholder = NULL;
berryzplus marked this conversation as resolved.
Show resolved Hide resolved
SAFE_DELETE(m_pcsbwVSplitBox); /* 垂直分割ボックス */
SAFE_DELETE(m_pcsbwHSplitBox); /* 水平分割ボックス */

Expand Down Expand Up @@ -969,9 +1003,8 @@ void CEditView::OnSize( int cx, int cy )
}

/* サイズボックス */
if( NULL != m_hwndSizeBox ){
::MoveWindow( m_hwndSizeBox, cx - nCxVScroll, cy - nCyHScroll, nCxHScroll, nCyVScroll, TRUE );
}
::MoveWindow( m_hwndSizeBox, cx - nCxVScroll, cy - nCyHScroll, nCxHScroll, nCyVScroll, TRUE );
::MoveWindow( m_hwndSizeBoxPlaceholder, cx - nCxVScroll, cy - nCyHScroll, nCxHScroll, nCyVScroll, TRUE );
int nAreaWidthOld = GetTextArea().GetAreaWidth();
int nAreaHeightOld = GetTextArea().GetAreaHeight();

Expand Down Expand Up @@ -1825,45 +1858,12 @@ void CEditView::SplitBoxOnOff( BOOL bVert, BOOL bHorz, BOOL bSizeBox )
}

if( bSizeBox ){
if( NULL != m_hwndSizeBox ){
::DestroyWindow( m_hwndSizeBox );
m_hwndSizeBox = NULL;
}
m_hwndSizeBox = ::CreateWindowEx(
0L, /* no extended styles */
_T("SCROLLBAR"), /* scroll bar control class */
NULL, /* text for window title bar */
WS_VISIBLE | WS_CHILD | SBS_SIZEBOX | SBS_SIZEGRIP, /* scroll bar styles */
0, /* horizontal position */
0, /* vertical position */
200, /* width of the scroll bar */
CW_USEDEFAULT, /* default height */
GetHwnd(), /* handle of main window */
(HMENU) NULL, /* no menu for a scroll bar */
G_AppInstance(), /* instance owning this window */
(LPVOID) NULL /* pointer not needed */
);
::ShowWindow( m_hwndSizeBoxPlaceholder, SW_HIDE );
::ShowWindow( m_hwndSizeBox, SW_SHOW );
}else{
if( NULL != m_hwndSizeBox ){
::DestroyWindow( m_hwndSizeBox );
m_hwndSizeBox = NULL;
}
m_hwndSizeBox = ::CreateWindowEx(
0L, /* no extended styles */
_T("STATIC"), /* scroll bar control class */
NULL, /* text for window title bar */
WS_VISIBLE | WS_CHILD /*| SBS_SIZEBOX | SBS_SIZEGRIP*/, /* scroll bar styles */
0, /* horizontal position */
0, /* vertical position */
200, /* width of the scroll bar */
CW_USEDEFAULT, /* default height */
GetHwnd(), /* handle of main window */
(HMENU) NULL, /* no menu for a scroll bar */
G_AppInstance(), /* instance owning this window */
(LPVOID) NULL /* pointer not needed */
);
::ShowWindow( m_hwndSizeBox, SW_HIDE );
::ShowWindow( m_hwndSizeBoxPlaceholder, SW_SHOW );
}
::ShowWindow( m_hwndSizeBox, SW_SHOW );

::GetClientRect( GetHwnd(), &rc );
OnSize( rc.right, rc.bottom );
Expand Down
1 change: 1 addition & 0 deletions sakura_core/view/CEditView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,7 @@ class CEditView
int m_nVScrollRate; /* 垂直スクロールバーの縮尺 */
HWND m_hwndHScrollBar; /* 水平スクロールバーウィンドウハンドル */
HWND m_hwndSizeBox; /* サイズボックスウィンドウハンドル */
HWND m_hwndSizeBoxPlaceholder; /* サイズボックス代替スタティックウィンドウハンドル */
CSplitBoxWnd* m_pcsbwVSplitBox; /* 垂直分割ボックス */
CSplitBoxWnd* m_pcsbwHSplitBox; /* 水平分割ボックス */
CAutoScrollWnd m_cAutoScrollWnd; //!< オートスクロール
Expand Down
39 changes: 6 additions & 33 deletions sakura_core/view/CEditView_Scroll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,35 +93,11 @@ BOOL CEditView::CreateScrollBar()

/* サイズボックス */
if( GetDllShareData().m_Common.m_sWindow.m_nFUNCKEYWND_Place == 0 ){ /* ファンクションキー表示位置／0:上 1:下 */
m_hwndSizeBox = ::CreateWindowEx(
WS_EX_CONTROLPARENT/*0L*/, /* no extended styles */
_T("SCROLLBAR"), /* scroll bar control class */
NULL, /* text for window title bar */
WS_VISIBLE | WS_CHILD | SBS_SIZEBOX | SBS_SIZEGRIP, /* scroll bar styles */
0, /* horizontal position */
0, /* vertical position */
200, /* width of the scroll bar */
CW_USEDEFAULT, /* default height */
GetHwnd(), /* handle of main window */
(HMENU) NULL, /* no menu for a scroll bar */
G_AppInstance(), /* instance owning this window */
(LPVOID) NULL /* pointer not needed */
);
::ShowWindow( m_hwndSizeBoxPlaceholder, SW_HIDE );
::ShowWindow( m_hwndSizeBox, SW_SHOW );
}else{
m_hwndSizeBox = ::CreateWindowEx(
0L, /* no extended styles */
_T("STATIC"), /* scroll bar control class */
NULL, /* text for window title bar */
WS_VISIBLE | WS_CHILD/* | SBS_SIZEBOX | SBS_SIZEGRIP*/, /* scroll bar styles */
0, /* horizontal position */
0, /* vertical position */
200, /* width of the scroll bar */
CW_USEDEFAULT, /* default height */
GetHwnd(), /* handle of main window */
(HMENU) NULL, /* no menu for a scroll bar */
G_AppInstance(), /* instance owning this window */
(LPVOID) NULL /* pointer not needed */
);
::ShowWindow( m_hwndSizeBox, SW_HIDE );
::ShowWindow( m_hwndSizeBoxPlaceholder, SW_SHOW );
}
return TRUE;
}
Expand All @@ -145,11 +121,8 @@ void CEditView::DestroyScrollBar()
m_hwndHScrollBar = NULL;
}

if( m_hwndSizeBox )
{
::DestroyWindow( m_hwndSizeBox );
m_hwndSizeBox = NULL;
}
::ShowWindow( m_hwndSizeBox, SW_HIDE );
::ShowWindow( m_hwndSizeBoxPlaceholder, SW_HIDE );
}

/*! 垂直スクロールバーメッセージ処理
Expand Down