https://git.reactos.org/?p=reactos.git;a=commitdiff;h=893715b72267723cb2a40052f4cea8453e2d1eb0
commit 893715b72267723cb2a40052f4cea8453e2d1eb0 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Thu Aug 10 08:20:55 2023 +0900 Commit: GitHub <[email protected]> CommitDate: Thu Aug 10 08:20:55 2023 +0900 [MSPAINT] Fix focus and radiobuttons of some dialogs (#5537) - Return TRUE on WM_INITDIALOG handling to set focus. - Check if the radiobutton is checked on the radiobutton action (considering BN_SETFOCUS etc.). CORE-18011 --- base/applications/mspaint/dialogs.cpp | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 9c9fad3e567..7ec302dfe7f 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -42,7 +42,7 @@ LRESULT CMirrorRotateDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lPara { CheckDlgButton(IDD_MIRRORROTATERB1, BST_CHECKED); CheckDlgButton(IDD_MIRRORROTATERB4, BST_CHECKED); - return 0; + return TRUE; } LRESULT CMirrorRotateDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -74,6 +74,9 @@ LRESULT CMirrorRotateDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_MIRRORROTATERB3) != BST_CHECKED) + return 0; + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), TRUE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), TRUE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), TRUE); @@ -82,6 +85,12 @@ LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWn LRESULT CMirrorRotateDialog::OnRadioButton12(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_MIRRORROTATERB1) != BST_CHECKED && + IsDlgButtonChecked(IDD_MIRRORROTATERB2) != BST_CHECKED) + { + return 0; + } + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), FALSE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), FALSE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), FALSE); @@ -122,7 +131,7 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, strRes.Format(IDS_PRINTRES, ROUND(PpcmFromDpi(g_xDpi)), ROUND(PpcmFromDpi(g_yDpi))); SetDlgItemText(IDD_ATTRIBUTESTEXT8, strRes); - return 0; + return TRUE; } LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -156,6 +165,9 @@ LRESULT CAttributesDialog::OnDefault(WORD wNotifyCode, WORD wID, HWND hWndCtl, B LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1) != BST_CHECKED) + return 0; + CString strNum; strNum.Format(_T("%.3lf"), newWidth / g_xDpi); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); @@ -166,6 +178,9 @@ LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndC LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2) != BST_CHECKED) + return 0; + CString strNum; strNum.Format(_T("%.3lf"), newWidth / PpcmFromDpi(g_xDpi)); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); @@ -176,6 +191,9 @@ LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndC LRESULT CAttributesDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3) != BST_CHECKED) + return 0; + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); return 0; @@ -239,7 +257,7 @@ LRESULT CStretchSkewDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam SetDlgItemInt(IDD_STRETCHSKEWEDITVSTRETCH, 100, FALSE); SetDlgItemInt(IDD_STRETCHSKEWEDITHSKEW, 0, FALSE); SetDlgItemInt(IDD_STRETCHSKEWEDITVSKEW, 0, FALSE); - return 0; + return TRUE; } LRESULT CStretchSkewDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
