[ros-diffs] [reactos] 01/01: [MSPAINT] Don't show canvas size boxes if textEditWindow is shown

[Katayama Hirofumi MZ]

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

commit f6bd638b4de41253e0a39cc6e34eaa5a65ddcc79
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Jun 19 08:36:45 2023 +0900
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Mon Jun 19 08:36:45 2023 +0900

    [MSPAINT] Don't show canvas size boxes if textEditWindow is shown
    
    CORE-18867
---
 base/applications/mspaint/canvas.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp
index 45c182cf3bd..8588aa76522 100644
--- a/base/applications/mspaint/canvas.cpp
+++ b/base/applications/mspaint/canvas.cpp
@@ -96,6 +96,8 @@ VOID CCanvasWindow::GetImageRect(RECT& rc)
 
 CANVAS_HITTEST CCanvasWindow::CanvasHitTest(POINT pt)
 {
+    if (selectionModel.m_bShow || ::IsWindowVisible(textEditWindow))
+        return HIT_INNER;
     RECT rcBase = GetBaseRect();
     return getSizeBoxHitTest(pt, &rcBase);
 }
@@ -112,7 +114,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT&
rcPaint)
 
     // Draw the sizeboxes if necessary
     RECT rcBase = GetBaseRect();
-    if (!selectionModel.m_bShow)
+    if (!selectionModel.m_bShow && !::IsWindowVisible(textEditWindow))
         drawSizeBoxes(hdcMem0, &rcBase, FALSE, &rcPaint);
 
     // Calculate image size