[ros-diffs] [reactos] 01/01: [MSPAINT] Add CMainWindow::CanUndo/CanRedo (#5355)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64ef3ced9c35b801d092f…

commit 64ef3ced9c35b801d092fd1f049cefa5ed96fe5e
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Jun 19 14:13:43 2023 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Mon Jun 19 14:13:43 2023 +0900

    [MSPAINT] Add CMainWindow::CanUndo/CanRedo (#5355)
    
    - Add CMainWindow::CanUndo and CMainWindow::CanRedo and use them.
    - Fix wrongly-disabled Undo/Redo in some cases.
    CORE-18867
---
 base/applications/mspaint/winproc.cpp | 33 ++++++++++++++++++++++++++-------
 base/applications/mspaint/winproc.h   |  2 ++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/base/applications/mspaint/winproc.cpp
b/base/applications/mspaint/winproc.cpp
index 3ac4b5b60d8..e80f8572dc2 100644
--- a/base/applications/mspaint/winproc.cpp
+++ b/base/applications/mspaint/winproc.cpp
@@ -416,6 +416,26 @@ void CMainWindow::ProcessFileMenu(HMENU hPopupMenu)
     }
 }
 
+BOOL CMainWindow::CanUndo() const
+{
+    if (toolsModel.GetActiveTool() == TOOL_TEXT &&
::IsWindowVisible(textEditWindow))
+        return (BOOL)textEditWindow.SendMessage(EM_CANUNDO);
+    if (selectionModel.m_bShow && toolsModel.IsSelection())
+        return TRUE;
+    if (ToolBase::pointSP != 0)
+        return TRUE;
+    return imageModel.CanUndo();
+}
+
+BOOL CMainWindow::CanRedo() const
+{
+    if (toolsModel.GetActiveTool() == TOOL_TEXT &&
::IsWindowVisible(textEditWindow))
+        return FALSE; // There is no "WM_REDO" in EDIT control
+    if (ToolBase::pointSP != 0)
+        return TRUE;
+    return imageModel.CanRedo();
+}
+
 LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL&
bHandled)
 {
     HMENU menu = (HMENU)wParam;
@@ -437,9 +457,8 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM
lParam, BO
     //
     // Edit menu
     //
-    EnableMenuItem(menu, IDM_EDITUNDO,
-        ENABLED_IF(textShown ? textEditWindow.SendMessage(EM_CANUNDO) :
imageModel.CanUndo()));
-    EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(textShown ? FALSE :
imageModel.CanRedo()));
+    EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(CanUndo()));
+    EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(CanRedo()));
     EnableMenuItem(menu, IDM_EDITCUT, ENABLED_IF(textShown ? hasTextSel :
trueSelection));
     EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(textShown ? hasTextSel :
trueSelection));
     EnableMenuItem(menu, IDM_EDITDELETESELECTION,
@@ -448,9 +467,9 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM
lParam, BO
     EnableMenuItem(menu, IDM_EDITCOPYTO, ENABLED_IF(trueSelection));
     EnableMenuItem(menu, IDM_EDITPASTE,
                    ENABLED_IF(textShown ? ::IsClipboardFormatAvailable(CF_UNICODETEXT) :
-                              ::IsClipboardFormatAvailable(CF_ENHMETAFILE) ||
-                              ::IsClipboardFormatAvailable(CF_DIB) ||
-                              ::IsClipboardFormatAvailable(CF_BITMAP)));
+                              (::IsClipboardFormatAvailable(CF_ENHMETAFILE) ||
+                               ::IsClipboardFormatAvailable(CF_DIB) ||
+                               ::IsClipboardFormatAvailable(CF_BITMAP))));
 
     //
     // View menu
@@ -681,7 +700,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM
lParam, BOOL& bH
         case IDM_EDITREDO:
             if (textShown)
             {
-                // There is no "WM_REDO". Do nothing
+                // There is no "WM_REDO" in EDIT control
                 break;
             }
             if (ToolBase::pointSP != 0) // drawing something?
diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/winproc.h
index 71fe89282d2..7984057184d 100644
--- a/base/applications/mspaint/winproc.h
+++ b/base/applications/mspaint/winproc.h
@@ -35,6 +35,8 @@ public:
     BOOL GetSaveFileName(IN OUT LPTSTR pszFile, INT cchMaxFile);
     BOOL ChooseColor(IN OUT COLORREF *prgbColor);
     VOID TrackPopupMenu(POINT ptScreen, INT iSubMenu);
+    BOOL CanUndo() const;
+    BOOL CanRedo() const;
 
 private:
     HMENU m_hMenu;