From 1a1408ba6b8e2f60d38d4c34a812ea9462a6b564 Mon Sep 17 00:00:00 2001 From: Katsuhisa Yuasa Date: Mon, 5 Oct 2020 08:27:15 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=97=E3=83=AD=E3=83=91=E3=83=86=E3=82=A3?= =?UTF-8?q?=E3=82=B7=E3=83=BC=E3=83=88=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=AB=E8=A1=A8=E7=A4=BA=E3=81=AE=E3=81=A1?= =?UTF-8?q?=E3=82=89=E3=81=A4=E3=81=8D=E9=98=B2=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/prop/CPropComCustmenu.cpp | 3 +++ sakura_core/prop/CPropComKeybind.cpp | 2 ++ sakura_core/prop/CPropComKeyword.cpp | 11 +++++------ sakura_core/prop/CPropComMainMenu.cpp | 2 ++ sakura_core/prop/CPropComTab.cpp | 4 ++++ sakura_core/prop/CPropComToolbar.cpp | 2 ++ sakura_core/sakura_rc.rc | 8 ++++---- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/sakura_core/prop/CPropComCustmenu.cpp b/sakura_core/prop/CPropComCustmenu.cpp index 703f4b798d..9cd3ce1ad7 100644 --- a/sakura_core/prop/CPropComCustmenu.cpp +++ b/sakura_core/prop/CPropComCustmenu.cpp @@ -665,6 +665,7 @@ void CPropCustmenu::SetDataMenuList(HWND hwndDlg, int nIdx) WCHAR szLabel[300]; WCHAR szLabel2[300+4]; + ::SendMessageAny( hwndDlg, WM_SETREDRAW, FALSE, 0 ); /* メニュー項目一覧に文字列をセット（リストボックス）*/ HWND hwndLIST_RES = ::GetDlgItem( hwndDlg, IDC_LIST_RES ); // hwndEDIT_KEY = ::GetDlgItem( hwndDlg, IDC_EDIT_KEY ); @@ -694,6 +695,8 @@ void CPropCustmenu::SetDataMenuList(HWND hwndDlg, int nIdx) ::DlgItem_SetText( hwndDlg, IDC_EDIT_MENUNAME, m_Common.m_sCustomMenu.m_szCustMenuNameArr[nIdx] ); CheckDlgButtonBool( hwndDlg, IDC_CHECK_SUBMENU, m_Common.m_sCustomMenu.m_bCustMenuPopupArr[nIdx] ); + ::SendMessageAny( hwndDlg, WM_SETREDRAW, TRUE, 0 ); + ::InvalidateRect( hwndDlg, NULL, FALSE ); return; } diff --git a/sakura_core/prop/CPropComKeybind.cpp b/sakura_core/prop/CPropComKeybind.cpp index 6f73016573..79753369da 100644 --- a/sakura_core/prop/CPropComKeybind.cpp +++ b/sakura_core/prop/CPropComKeybind.cpp @@ -460,6 +460,7 @@ void CPropKeybind::ChangeKeyList( HWND hwndDlg){ i |= _ALT; wcscat( szKeyState, L"Alt+" ); } + ::SendMessageAny( hwndKeyList, WM_SETREDRAW, FALSE, 0 ); /* キー一覧に文字列をセット（リストボックス）*/ List_ResetContent( hwndKeyList ); for( i = 0; i < m_Common.m_sKeyBind.m_nKeyNameArrNum; ++i ){ @@ -470,6 +471,7 @@ void CPropKeybind::ChangeKeyList( HWND hwndDlg){ List_SetCurSel( hwndKeyList, nIndex ); List_SetTopIndex( hwndKeyList, nIndexTop ); ::SendMessageCmd( hwndDlg, WM_COMMAND, MAKELONG( IDC_LIST_KEY, LBN_SELCHANGE ), (LPARAM)hwndKeyList ); + ::SendMessageAny( hwndKeyList, WM_SETREDRAW, TRUE, 0 ); } /* Keybind:キー割り当て設定をインポートする */ diff --git a/sakura_core/prop/CPropComKeyword.cpp b/sakura_core/prop/CPropComKeyword.cpp index d6dc29134b..73379dc67c 100644 --- a/sakura_core/prop/CPropComKeyword.cpp +++ b/sakura_core/prop/CPropComKeyword.cpp @@ -616,6 +616,8 @@ void CPropKeyword::SetKeyWordSet( HWND hwndDlg, int nIdx ) HWND hwndList; LV_ITEM lvi; + ::SendMessageAny( hwndDlg, WM_SETREDRAW, FALSE, 0 ); + ListView_DeleteAllItems( ::GetDlgItem( hwndDlg, IDC_LIST_KEYWORD ) ); if( 0 <= nIdx ){ ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_BUTTON_DELSET ), TRUE ); @@ -654,9 +656,6 @@ void CPropKeyword::SetKeyWordSet( HWND hwndDlg, int nIdx ) nNum = m_Common.m_sSpecialKeyword.m_CKeyWordSetMgr.GetKeyWordNum( nIdx ); hwndList = ::GetDlgItem( hwndDlg, IDC_LIST_KEYWORD ); - // 2005.01.25 Moca/genta リスト追加中は再描画を抑制してすばやく表示 - ::SendMessageAny( hwndList, WM_SETREDRAW, FALSE, 0 ); - for( i = 0; i < nNum; ++i ){ /* ｎ番目のセットのｍ番目のキーワードを返す */ const WCHAR* pszKeyWord = m_Common.m_sSpecialKeyword.m_CKeyWordSetMgr.GetKeyWord( nIdx, i ); @@ -670,12 +669,12 @@ void CPropKeyword::SetKeyWordSet( HWND hwndDlg, int nIdx ) } m_Common.m_sSpecialKeyword.m_CKeyWordSetMgr.m_nCurrentKeyWordSetIdx = nIdx; - // 2005.01.25 Moca/genta リスト追加完了のため再描画許可 - ::SendMessageAny( hwndList, WM_SETREDRAW, TRUE, 0 ); - //キーワード数を表示する。 DispKeywordCount( hwndDlg ); + ::SendMessageAny( hwndDlg, WM_SETREDRAW, TRUE, 0 ); + InvalidateRect(hwndDlg, NULL, FALSE); + return; } diff --git a/sakura_core/prop/CPropComMainMenu.cpp b/sakura_core/prop/CPropComMainMenu.cpp index 01ad525c08..960b262941 100644 --- a/sakura_core/prop/CPropComMainMenu.cpp +++ b/sakura_core/prop/CPropComMainMenu.cpp @@ -417,6 +417,7 @@ INT_PTR CPropMainMenu::DispatchEvent( case CBN_SELCHANGE: nIdxFIdx = Combo_GetCurSel( hwndComboFunkKind ); + ::SendMessageAny( hwndListFunk, WM_SETREDRAW, FALSE, 0 ); if (nIdxFIdx == nSpecialFuncsNum) { // 機能一覧に特殊機能をセット List_ResetContent( hwndListFunk ); @@ -428,6 +429,7 @@ INT_PTR CPropMainMenu::DispatchEvent( /* 機能一覧に文字列をセット（リストボックス）*/ m_cLookup.SetListItem( hwndListFunk, nIdxFIdx ); } + ::SendMessageAny( hwndListFunk, WM_SETREDRAW, TRUE, 0 ); return TRUE; } diff --git a/sakura_core/prop/CPropComTab.cpp b/sakura_core/prop/CPropComTab.cpp index e0e3334a60..2ff079b7e6 100644 --- a/sakura_core/prop/CPropComTab.cpp +++ b/sakura_core/prop/CPropComTab.cpp @@ -191,6 +191,8 @@ INT_PTR CPropTab::DispatchEvent( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM /* ダイアログデータの設定 */ void CPropTab::SetData( HWND hwndDlg ) { + ::SendMessage(hwndDlg, WM_SETREDRAW, (WPARAM)FALSE, 0); + // Feb. 11, 2007 genta「ウィンドウ」シートより移動 ::CheckDlgButton( hwndDlg, IDC_CHECK_DispTabWnd, m_Common.m_sTabBar.m_bDispTabWnd ); //@@@ 2003.05.31 MIK ::CheckDlgButton( hwndDlg, IDC_CHECK_SameTabWidth, m_Common.m_sTabBar.m_bSameTabWidth ); //@@@ 2006.01.28 ryoji @@ -233,6 +235,8 @@ void CPropTab::SetData( HWND hwndDlg ) m_hTabFont = SetFontLabel( hwndDlg, IDC_STATIC_TABFONT, m_Common.m_sTabBar.m_lf, m_Common.m_sTabBar.m_nPointSize); EnableTabPropInput(hwndDlg); + + ::SendMessage(hwndDlg, WM_SETREDRAW, (WPARAM)TRUE, 0); } /* ダイアログデータの取得 */ diff --git a/sakura_core/prop/CPropComToolbar.cpp b/sakura_core/prop/CPropComToolbar.cpp index 2d77c4307a..0871f8fdb9 100644 --- a/sakura_core/prop/CPropComToolbar.cpp +++ b/sakura_core/prop/CPropComToolbar.cpp @@ -268,6 +268,7 @@ INT_PTR CPropToolbar::DispatchEvent( case CBN_SELCHANGE: nIndex2 = Combo_GetCurSel( hwndCombo ); + ::SendMessageAny( hwndFuncList, WM_SETREDRAW, FALSE, 0 ); List_ResetContent( hwndFuncList ); /* 機能一覧に文字列をセット (リストボックス) */ @@ -286,6 +287,7 @@ INT_PTR CPropToolbar::DispatchEvent( lResult = List_SetItemHeight( hwndFuncList, lResult, nListItemHeight ); } } + ::SendMessageAny( hwndFuncList, WM_SETREDRAW, TRUE, 0 ); return TRUE; } }else{ diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 8a5c354a5c..1643b688ec 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -1173,7 +1173,7 @@ END IDD_PROP_TAB DIALOGEX 0, 0, 293, 240 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_CONTEXTHELP +EXSTYLE WS_EX_CONTEXTHELP | WS_EX_COMPOSITED FONT 9, "ＭＳ Ｐゴシック" BEGIN CONTROL "タブバーを表示する(&D)", IDC_CHECK_DispTabWnd, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 11, 111, 10 @@ -1187,7 +1187,7 @@ BEGIN LTEXT "閉じるボタン(&X)", IDC_TextTabClose, 124, 116, 48, 8 COMBOBOX IDC_CHECK_DispTabClose, 173, 113, 46, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "フォント(&F)...", IDC_BUTTON_TABFONT, 232, 113, 51, 14 - RTEXT "Font", IDC_STATIC_TABFONT, 102, 127, 180, 17, SS_RIGHT + RTEXT "Font", IDC_STATIC_TABFONT, 102, 127, 180, 12, SS_RIGHT CONTROL "タブ一覧をソートする(&S)", IDC_CHECK_SortTabList, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 129, 85, 10 CONTROL "多段(&M)", IDC_CHECK_TAB_MULTILINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 141, 60, 10 RTEXT "表示位置(&P)", IDC_TAB_POSITION, 80, 143, 40, 8 @@ -1404,7 +1404,7 @@ END IDD_PROP_KEYBIND DIALOGEX 0, 0, 293, 240 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_CONTEXTHELP +EXSTYLE WS_EX_CONTEXTHELP | WS_EX_COMPOSITED FONT 9, "ＭＳ Ｐゴシック" BEGIN RTEXT "種別(&K)", IDC_LABEL_MENUFUNCKIND, 4, 4, 51, 8 @@ -1428,7 +1428,7 @@ END IDD_PROP_CUSTMENU DIALOGEX 0, 0, 293, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_CONTEXTHELP +EXSTYLE WS_EX_CONTEXTHELP | WS_EX_COMPOSITED FONT 9, "ＭＳ Ｐゴシック" BEGIN RTEXT "種別(&K)", IDC_LABEL_MENUFUNCKIND, 4, 4, 52, 8