Merge pull request #316 from m-tmatma/feature/reorder-tab-order-about…

…-dlg バージョンダイアログのタブオーダーを変える (#233 の準備)
sakura-editor · Aug 7, 2018 · 0c190ff · 0c190ff
2 parents 96ab230 + 2a5122d
commit 0c190ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/sakura_core/dlg/CDlgAbout.cpp b/sakura_core/dlg/CDlgAbout.cpp
@@ -308,7 +308,16 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
 	//m_UrlOrgWnd.SubclassWindow( GetItemHwnd(IDC_STATIC_URL_ORG ) );
 
 	/* 基底クラスメンバ */
-	return CDialog::OnInitDialog( GetHwnd(), wParam, lParam );
+	(void)CDialog::OnInitDialog( GetHwnd(), wParam, lParam );
+
+	/* デフォルトでは一番最初のタブオーダーの要素になるので明示的に OK ボタンにフォーカスを合わせる */
+	::SetFocus(GetItemHwnd(IDOK));
+
+	/*
+		SetFocus() の効果を有効にするために FALSE を返す
+		参考: https://msdn.microsoft.com/ja-jp/library/fwz35s59.aspx
+	*/
+	return FALSE;
 }
 
 

diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc
@@ -102,8 +102,6 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "バージョン情報"
 FONT 9, "ＭＳ Ｐゴシック"
 BEGIN
-    DEFPUSHBUTTON   "&OK", IDOK, 97, 188, 50, 14
-    PUSHBUTTON      "情報をコピー(&C)", IDC_BUTTON_COPY, 178, 188, 60, 14
     ICON            IDI_ICON_STD, IDC_STATIC_MYICON, 5, 5, 20, 20, SS_NOTIFY
     EDITTEXT        IDC_EDIT_VER, 33, 6, 204, 51, ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT           S_COPYRIGHT, IDC_STATIC, 33, 61, 205, 8, NOT WS_GROUP | SS_NOPREFIX
@@ -118,6 +116,8 @@ BEGIN
     LTEXT           "Commit", IDC_STATIC_URL_GITHUB_COMMIT, 101, 118, 30, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP
     LTEXT           "PR.", IDC_STATIC_URL_GITHUB_PR, 150, 118, 30, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP
     EDITTEXT        IDC_EDIT_ABOUT, 5, 131, 233, 53, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP
+    DEFPUSHBUTTON   "&OK", IDOK, 97, 188, 50, 14
+    PUSHBUTTON      "情報をコピー(&C)", IDC_BUTTON_COPY, 178, 188, 60, 14
 END
 
 IDD_JUMP DIALOGEX 0, 0, 252, 121

diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc
@@ -104,8 +104,6 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Version Information"
 FONT 9, "Tahoma"
 BEGIN
-    DEFPUSHBUTTON   "&OK", IDOK, 97, 188, 50, 14
-    PUSHBUTTON      "&Copy to Clipboard", IDC_BUTTON_COPY, 178, 188, 60, 14
     ICON            IDI_ICON_STD, IDC_STATIC_MYICON, 5, 5, 20, 20, SS_NOTIFY
     EDITTEXT        IDC_EDIT_VER, 33, 6, 204, 51, ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT           S_COPYRIGHT, IDC_STATIC, 33, 61, 205, 8, NOT WS_GROUP | SS_NOPREFIX
@@ -120,6 +118,8 @@ BEGIN
     LTEXT           "Commit", IDC_STATIC_URL_GITHUB_COMMIT, 101, 118, 30, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP
     LTEXT           "PR.", IDC_STATIC_URL_GITHUB_PR, 150, 118, 30, 8, SS_NOTIFY | NOT WS_GROUP | WS_TABSTOP
     EDITTEXT        IDC_EDIT_ABOUT, 5, 131, 233, 53, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP
+    DEFPUSHBUTTON   "&OK", IDOK, 97, 188, 50, 14
+    PUSHBUTTON      "&Copy to Clipboard", IDC_BUTTON_COPY, 178, 188, 60, 14
 END
 
 IDD_JUMP DIALOGEX 0, 0, 252, 121