Ros-diffs

ros-diffs@reactos.org

19 participants
81102 discussions

[reactos] 01/01: [MSPAINT] Simplify SelectionModel::StretchSkew

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5335fb90b9ca59aa015c… commit b5335fb90b9ca59aa015c5de71df7d305ea1d441 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 14:11:16 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 19 14:11:16 2023 +0900 [MSPAINT] Simplify SelectionModel::StretchSkew ...and omit cloning HBITMAP in SelectionModel::InsertFromHBITMAP. CORE-18867 --- base/applications/mspaint/selectionmodel.cpp | 54 ++++++++++++++-------------- base/applications/mspaint/winproc.cpp | 1 - 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index e14adddc0c2..13546bc790c 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -212,7 +212,7 @@ void SelectionModel::Landing() void SelectionModel::InsertFromHBITMAP(HBITMAP hbmColor, INT x, INT y, HBITMAP hbmMask) { ::DeleteObject(m_hbmColor); - m_hbmColor = CopyDIBImage(hbmColor); + m_hbmColor = hbmColor; m_rc.left = x; m_rc.top = y; @@ -222,7 +222,7 @@ void SelectionModel::InsertFromHBITMAP(HBITMAP hbmColor, INT x, INT y, HBITMAP h if (hbmMask) { ::DeleteObject(m_hbmMask); - m_hbmMask = CopyMonoImage(hbmMask); + m_hbmMask = hbmMask; } else { @@ -332,6 +332,14 @@ void SelectionModel::RotateNTimes90Degrees(int iN) NotifyContentChanged(); } +static void AttachHBITMAP(HBITMAP *phbm, HBITMAP hbmNew) +{ + if (hbmNew == NULL) + return; + ::DeleteObject(*phbm); + *phbm = hbmNew; +} + void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY) { if (nStretchPercentX == 100 && nStretchPercentY == 100 && nSkewDegX == 0 && nSkewDegY == 0) @@ -339,54 +347,46 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int TakeOff(); - INT oldWidth = m_rc.Width(); - INT oldHeight = m_rc.Height(); + INT oldWidth = m_rc.Width(), oldHeight = m_rc.Height(); INT newWidth = oldWidth * nStretchPercentX / 100; INT newHeight = oldHeight * nStretchPercentY / 100; - HBITMAP hbmColor, hbmMask; - HGDIOBJ hbmOld; + HBITMAP hbmColor = m_hbmColor, hbmMask = m_hbmMask; - if (m_hbmMask == NULL) - m_hbmMask = CreateMonoBitmap(newWidth, newHeight, TRUE); + if (hbmMask == NULL) + hbmMask = CreateMonoBitmap(oldWidth, oldHeight, TRUE); if (oldWidth != newWidth || oldHeight != newHeight) { - hbmColor = CopyDIBImage(m_hbmColor, newWidth, newHeight); - hbmMask = CopyMonoImage(m_hbmMask, newWidth, newHeight); - InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); - ::DeleteObject(hbmColor); - ::DeleteObject(hbmMask); + AttachHBITMAP(&hbmColor, CopyDIBImage(hbmColor, newWidth, newHeight)); + AttachHBITMAP(&hbmMask, CopyMonoImage(hbmMask, newWidth, newHeight)); } + HGDIOBJ hbmOld; HDC hDC = ::CreateCompatibleDC(NULL); if (nSkewDegX) { - hbmOld = ::SelectObject(hDC, m_hbmColor); - hbmColor = SkewDIB(hDC, m_hbmColor, nSkewDegX, FALSE); - ::SelectObject(hDC, m_hbmMask); - hbmMask = SkewDIB(hDC, m_hbmMask, nSkewDegX, FALSE, TRUE); + hbmOld = ::SelectObject(hDC, hbmColor); + AttachHBITMAP(&hbmColor, SkewDIB(hDC, hbmColor, nSkewDegX, FALSE)); + ::SelectObject(hDC, hbmMask); + AttachHBITMAP(&hbmMask, SkewDIB(hDC, hbmMask, nSkewDegX, FALSE, TRUE)); ::SelectObject(hDC, hbmOld); - InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); - ::DeleteObject(hbmColor); - ::DeleteObject(hbmMask); } if (nSkewDegY) { - hbmOld = ::SelectObject(hDC, m_hbmColor); - hbmColor = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE); - ::SelectObject(hDC, m_hbmMask); - hbmMask = SkewDIB(hDC, m_hbmMask, nSkewDegY, TRUE, TRUE); + hbmOld = ::SelectObject(hDC, hbmColor); + AttachHBITMAP(&hbmColor, SkewDIB(hDC, hbmColor, nSkewDegY, TRUE)); + ::SelectObject(hDC, hbmMask); + AttachHBITMAP(&hbmMask, SkewDIB(hDC, hbmMask, nSkewDegY, TRUE, TRUE)); ::SelectObject(hDC, hbmOld); - InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); - ::DeleteObject(hbmColor); - ::DeleteObject(hbmMask); } ::DeleteDC(hDC); + InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); + m_bShow = TRUE; NotifyContentChanged(); } diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 7a22b153794..3ac4b5b60d8 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -844,7 +844,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (hbmNew) { InsertSelectionFromHBITMAP(hbmNew, m_hWnd); - DeleteObject(hbmNew); } } break;

1 year, 7 months

[reactos] 01/01: [MSPAINT] Delete useless CTextEditWindow::m_nAppIsMovingOrSizing

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bb0561c2d1142fc4451d… commit 7bb0561c2d1142fc4451dd32975772456c495ef0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 13:46:16 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 19 13:47:24 2023 +0900 [MSPAINT] Delete useless CTextEditWindow::m_nAppIsMovingOrSizing CORE-18867 --- base/applications/mspaint/textedit.cpp | 8 +++----- base/applications/mspaint/textedit.h | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 8ec1155d1c9..dcc21ab2a66 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -14,7 +14,9 @@ CTextEditWindow textEditWindow; /* FUNCTIONS ********************************************************/ -CTextEditWindow::CTextEditWindow() : m_hFont(NULL), m_hFontZoomed(NULL), m_nAppIsMovingOrSizing(0) +CTextEditWindow::CTextEditWindow() + : m_hFont(NULL) + , m_hFontZoomed(NULL) { SetRectEmpty(&m_rc); } @@ -77,9 +79,7 @@ void CTextEditWindow::FixEditPos(LPCTSTR pszOldText) ::GetClientRect(m_hwndParent, &rcParent); IntersectRect(&rc, &rcParent, &rcWnd); - ++m_nAppIsMovingOrSizing; MoveWindow(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, FALSE); - --m_nAppIsMovingOrSizing; DefWindowProc(WM_HSCROLL, SB_LEFT, 0); DefWindowProc(WM_VSCROLL, SB_TOP, 0); @@ -383,9 +383,7 @@ void CTextEditWindow::ValidateEditRect(LPCRECT prc OPTIONAL) CRect rc = m_rc; canvasWindow.ImageToCanvas(rc); - ++m_nAppIsMovingOrSizing; MoveWindow(rc.left, rc.top, rc.Width(), rc.Height(), TRUE); - --m_nAppIsMovingOrSizing; } LRESULT CTextEditWindow::OnMoving(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) diff --git a/base/applications/mspaint/textedit.h b/base/applications/mspaint/textedit.h index 7060919cae6..798ae1951fb 100644 --- a/base/applications/mspaint/textedit.h +++ b/base/applications/mspaint/textedit.h @@ -81,7 +81,6 @@ protected: HWND m_hwndParent; HFONT m_hFont; HFONT m_hFontZoomed; - LONG m_nAppIsMovingOrSizing; RECT m_rc; INT DoHitTest(RECT& rc, POINT pt);

1 year, 7 months

[reactos] 01/01: [MSPAINT] Follow-up Part 2 of Realize Masked Skew (96d3883)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdba69be7c64d4a46d977… commit fdba69be7c64d4a46d977a1219d3f1c94115831f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 10:11:35 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 19 10:11:35 2023 +0900 [MSPAINT] Follow-up Part 2 of Realize Masked Skew (96d3883) CORE-18867 --- base/applications/mspaint/selectionmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 609d2ffd59c..e14adddc0c2 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -378,7 +378,7 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int hbmOld = ::SelectObject(hDC, m_hbmColor); hbmColor = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE); ::SelectObject(hDC, m_hbmMask); - hbmMask = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE, TRUE); + hbmMask = SkewDIB(hDC, m_hbmMask, nSkewDegY, TRUE, TRUE); ::SelectObject(hDC, hbmOld); InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); ::DeleteObject(hbmColor);

1 year, 7 months

[reactos] 01/01: [MSPAINT] Improve Japanese (ja-JP) translation (IDS_CANTPASTE)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2661b2db61454a9e51aac… commit 2661b2db61454a9e51aac224872f34a895ecd193 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 10:07:30 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 19 10:08:04 2023 +0900 [MSPAINT] Improve Japanese (ja-JP) translation (IDS_CANTPASTE) CORE-18867 --- base/applications/mspaint/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 498c603aa55..f3d77b11507 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -261,5 +261,5 @@ BEGIN IDS_UNDERLINE "下線" IDS_VERTICAL "縦書き" IDS_PRINTRES "%d x %d ピクセル/cm" - IDS_CANTPASTE "申し訳ありませんが、このデータを貼り付けできません。データ形式が間違っているか、対応していません。" + IDS_CANTPASTE "クリップボードからの貼り付けに失敗しました。データ形式が間違っているか、未対応です。" END

1 year, 7 months

[reactos] 01/01: [MSPAINT] Follow-up of Realize Masked Skew (9afcbea)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96d388368696b481b5e28… commit 96d388368696b481b5e280898e7d788244d3976a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 10:00:39 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 19 10:00:39 2023 +0900 [MSPAINT] Follow-up of Realize Masked Skew (9afcbea) CORE-18867 --- base/applications/mspaint/dib.cpp | 2 +- base/applications/mspaint/selectionmodel.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index d72136f79d6..e2886e80a79 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -101,7 +101,7 @@ HBITMAP CopyMonoImage(HBITMAP hbm, INT cx, INT cy) HGDIOBJ hbm2Old = SelectObject(hdc2, hbmNew); StretchBlt(hdc2, 0, 0, cx, cy, hdc1, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); SelectObject(hdc1, hbm1Old); - SelectObject(hdc1, hbm2Old); + SelectObject(hdc2, hbm2Old); DeleteDC(hdc1); DeleteDC(hdc2); return hbmNew; diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index b96213313b1..609d2ffd59c 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -367,8 +367,8 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int hbmColor = SkewDIB(hDC, m_hbmColor, nSkewDegX, FALSE); ::SelectObject(hDC, m_hbmMask); hbmMask = SkewDIB(hDC, m_hbmMask, nSkewDegX, FALSE, TRUE); - InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); ::SelectObject(hDC, hbmOld); + InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); ::DeleteObject(hbmColor); ::DeleteObject(hbmMask); } @@ -379,8 +379,8 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int hbmColor = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE); ::SelectObject(hDC, m_hbmMask); hbmMask = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE, TRUE); - InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); ::SelectObject(hDC, hbmOld); + InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); ::DeleteObject(hbmColor); ::DeleteObject(hbmMask); }

1 year, 7 months

[reactos] 01/01: [MSPAINT] Realize Masked Skew

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9afcbea24e25f1ee46dd8… commit 9afcbea24e25f1ee46dd85fe28772dba8bd5ec09 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 09:56:02 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 19 09:56:02 2023 +0900 [MSPAINT] Realize Masked Skew - Add CreateMonoBitmap and CopyMonoImage functions to dib.cpp. - Add bMono parameter to SkewDIB function. - Add hbmMask parameter to InsertFromHBITMAP function. - Add ToolsModel::IsSelection. CORE-18867 --- base/applications/mspaint/canvas.cpp | 2 +- base/applications/mspaint/dib.cpp | 57 ++++++++++++++++++++++++++- base/applications/mspaint/dib.h | 5 ++- base/applications/mspaint/selectionmodel.cpp | 58 ++++++++++++++++++++-------- base/applications/mspaint/selectionmodel.h | 2 +- base/applications/mspaint/toolsmodel.cpp | 5 +++ base/applications/mspaint/toolsmodel.h | 2 + base/applications/mspaint/winproc.cpp | 7 +--- 8 files changed, 111 insertions(+), 27 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 8588aa76522..85b53df3273 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -449,7 +449,7 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL { toolsModel.OnMouseMove(TRUE, pt.x, pt.y); Invalidate(FALSE); - if ((toolsModel.GetActiveTool() >= TOOL_TEXT) || (toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_FREESEL)) + if ((toolsModel.GetActiveTool() >= TOOL_TEXT) || toolsModel.IsSelection()) { CString strSize; if ((toolsModel.GetActiveTool() >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index cb34859bd56..d72136f79d6 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -36,6 +36,26 @@ CreateDIBWithProperties(int width, int height) return CreateDIBSection(NULL, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); } +HBITMAP +CreateMonoBitmap(int width, int height, BOOL bWhite) +{ + HBITMAP hbm = CreateBitmap(width, height, 1, 1, NULL); + if (hbm == NULL) + return NULL; + + if (bWhite) + { + HDC hdc = CreateCompatibleDC(NULL); + HGDIOBJ hbmOld = SelectObject(hdc, hbm); + RECT rc = { 0, 0, width, height }; + FillRect(hdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH)); + SelectObject(hdc, hbmOld); + DeleteDC(hdc); + } + + return hbm; +} + HBITMAP CreateColorDIB(int width, int height, COLORREF rgb) { @@ -59,6 +79,34 @@ CreateColorDIB(int width, int height, COLORREF rgb) return ret; } +HBITMAP CopyMonoImage(HBITMAP hbm, INT cx, INT cy) +{ + BITMAP bm; + if (!GetObject(hbm, sizeof(bm), &bm)) + return NULL; + + if (cx == 0 || cy == 0) + { + cx = bm.bmWidth; + cy = bm.bmHeight; + } + + HBITMAP hbmNew = CreateBitmap(cx, cy, 1, 1, NULL); + if (!hbmNew) + return NULL; + + HDC hdc1 = CreateCompatibleDC(NULL); + HDC hdc2 = CreateCompatibleDC(NULL); + HGDIOBJ hbm1Old = SelectObject(hdc1, hbm); + HGDIOBJ hbm2Old = SelectObject(hdc2, hbmNew); + StretchBlt(hdc2, 0, 0, cx, cy, hdc1, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); + SelectObject(hdc1, hbm1Old); + SelectObject(hdc1, hbm2Old); + DeleteDC(hdc1); + DeleteDC(hdc2); + return hbmNew; +} + HBITMAP CachedBufferDIB(HBITMAP hbm, int minimalWidth, int minimalHeight) { if (minimalWidth <= 0) @@ -283,7 +331,7 @@ HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono) #define M_PI 3.14159265 #endif -HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical) +HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { if (nDegree == 0) return CopyDIBImage(hbm); @@ -301,7 +349,11 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical) if (dx == 0 && dy == 0) return CopyDIBImage(hbm); - HBITMAP hbmNew = CreateColorDIB(cx + dx, cy + dy, RGB(255, 255, 255)); + HBITMAP hbmNew; + if (bMono) + hbmNew = CreateMonoBitmap(cx + dx, cy + dy, FALSE); + else + hbmNew = CreateColorDIB(cx + dx, cy + dy, RGB(255, 255, 255)); if (!hbmNew) return NULL; @@ -329,6 +381,7 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical) BitBlt(hDC2, delta, y, cx, 1, hDC1, 0, y, SRCCOPY); } } + SelectObject(hDC2, hbm2Old); DeleteDC(hDC2); return hbmNew; diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 4958f612673..0aa6fa41796 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -9,9 +9,12 @@ #pragma once HBITMAP CreateDIBWithProperties(int width, int height); +HBITMAP CreateMonoBitmap(int width, int height, BOOL bWhite); HBITMAP CreateColorDIB(int width, int height, COLORREF rgb); HBITMAP CachedBufferDIB(HBITMAP hbm, int minimalWidth, int minimalHeight); +HBITMAP CopyMonoImage(HBITMAP hbm, INT cx = 0, INT cy = 0); + static inline HBITMAP CopyDIBImage(HBITMAP hbm, INT cx = 0, INT cy = 0) { return (HBITMAP)CopyImage(hbm, IMAGE_BITMAP, cx, cy, LR_COPYRETURNORG | LR_CREATEDIBSECTION); @@ -31,7 +34,7 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL i HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono); -HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical); +HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono = FALSE); float PpcmFromDpi(float dpi); diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index fb28ad5033a..b96213313b1 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -209,19 +209,27 @@ void SelectionModel::Landing() HideSelection(); } -void SelectionModel::InsertFromHBITMAP(HBITMAP hBm, INT x, INT y) +void SelectionModel::InsertFromHBITMAP(HBITMAP hbmColor, INT x, INT y, HBITMAP hbmMask) { ::DeleteObject(m_hbmColor); - m_hbmColor = CopyDIBImage(hBm); + m_hbmColor = CopyDIBImage(hbmColor); m_rc.left = x; m_rc.top = y; - m_rc.right = x + GetDIBWidth(hBm); - m_rc.bottom = y + GetDIBHeight(hBm); + m_rc.right = x + GetDIBWidth(hbmColor); + m_rc.bottom = y + GetDIBHeight(hbmColor); - NotifyContentChanged(); + if (hbmMask) + { + ::DeleteObject(m_hbmMask); + m_hbmMask = CopyMonoImage(hbmMask); + } + else + { + ClearMask(); + } - ClearMask(); + NotifyContentChanged(); } void SelectionModel::FlipHorizontally() @@ -336,29 +344,45 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int INT newWidth = oldWidth * nStretchPercentX / 100; INT newHeight = oldHeight * nStretchPercentY / 100; + HBITMAP hbmColor, hbmMask; + HGDIOBJ hbmOld; + + if (m_hbmMask == NULL) + m_hbmMask = CreateMonoBitmap(newWidth, newHeight, TRUE); + if (oldWidth != newWidth || oldHeight != newHeight) { - HBITMAP hbm0 = CopyDIBImage(m_hbmColor, newWidth, newHeight); - InsertFromHBITMAP(hbm0, m_rc.left, m_rc.top); - ::DeleteObject(hbm0); + hbmColor = CopyDIBImage(m_hbmColor, newWidth, newHeight); + hbmMask = CopyMonoImage(m_hbmMask, newWidth, newHeight); + InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); + ::DeleteObject(hbmColor); + ::DeleteObject(hbmMask); } HDC hDC = ::CreateCompatibleDC(NULL); if (nSkewDegX) { - ::SelectObject(hDC, m_hbmColor); - HBITMAP hbm1 = SkewDIB(hDC, m_hbmColor, nSkewDegX, FALSE); - InsertFromHBITMAP(hbm1, m_rc.left, m_rc.top); - ::DeleteObject(hbm1); + hbmOld = ::SelectObject(hDC, m_hbmColor); + hbmColor = SkewDIB(hDC, m_hbmColor, nSkewDegX, FALSE); + ::SelectObject(hDC, m_hbmMask); + hbmMask = SkewDIB(hDC, m_hbmMask, nSkewDegX, FALSE, TRUE); + InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); + ::SelectObject(hDC, hbmOld); + ::DeleteObject(hbmColor); + ::DeleteObject(hbmMask); } if (nSkewDegY) { - ::SelectObject(hDC, m_hbmColor); - HBITMAP hbm2 = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE); - InsertFromHBITMAP(hbm2, m_rc.left, m_rc.top); - ::DeleteObject(hbm2); + hbmOld = ::SelectObject(hDC, m_hbmColor); + hbmColor = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE); + ::SelectObject(hDC, m_hbmMask); + hbmMask = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE, TRUE); + InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); + ::SelectObject(hDC, hbmOld); + ::DeleteObject(hbmColor); + ::DeleteObject(hbmMask); } ::DeleteDC(hDC); diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 230c87dfdf5..248ae03f0d6 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -47,7 +47,7 @@ public: void DrawBackgroundPoly(HDC hDCImage, COLORREF crBg); void DrawBackgroundRect(HDC hDCImage, COLORREF crBg); void DrawSelection(HDC hDCImage, COLORREF crBg = 0, BOOL bBgTransparent = FALSE); - void InsertFromHBITMAP(HBITMAP hBm, INT x = 0, INT y = 0); + void InsertFromHBITMAP(HBITMAP hbmColor, INT x = 0, INT y = 0, HBITMAP hbmMask = NULL); // operation void FlipHorizontally(); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 76a123513b5..7593bc964c4 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -40,6 +40,11 @@ ToolBase *ToolsModel::GetOrCreateTool(TOOLTYPE nTool) return m_tools[nTool]; } +BOOL ToolsModel::IsSelection() const +{ + return (GetActiveTool() == TOOL_RECTSEL || GetActiveTool() == TOOL_FREESEL); +} + int ToolsModel::GetLineWidth() const { return m_lineWidth; diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index b8c819590a7..b31183b3584 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -82,6 +82,8 @@ private: public: ToolsModel(); ~ToolsModel(); + + BOOL IsSelection() const; int GetLineWidth() const; void SetLineWidth(int nLineWidth); int GetShapeStyle() const; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 72947626a8c..7a22b153794 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -419,9 +419,7 @@ void CMainWindow::ProcessFileMenu(HMENU hPopupMenu) LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { HMENU menu = (HMENU)wParam; - BOOL trueSelection = - (selectionModel.m_bShow && - ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); + BOOL trueSelection = (selectionModel.m_bShow && toolsModel.IsSelection()); BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); DWORD dwStart = 0, dwEnd = 0; if (textShown) @@ -667,8 +665,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH } if (selectionModel.m_bShow) { - if (toolsModel.GetActiveTool() == TOOL_RECTSEL || - toolsModel.GetActiveTool() == TOOL_FREESEL) + if (toolsModel.IsSelection()) { canvasWindow.cancelDrawing(); break;

1 year, 7 months

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

by 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

1 year, 7 months

[reactos] 01/01: [MSPAINT] Smartly restrict CTextEditWindow's size and position

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17bdf554743f08a32c940… commit 17bdf554743f08a32c940a1185cef4fb5a05fc38 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 08:24:17 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 19 08:25:23 2023 +0900 [MSPAINT] Smartly restrict CTextEditWindow's size and position ...by using WM_SIZING and WM_MOVING. CORE-18867 --- base/applications/mspaint/selectionmodel.cpp | 1 + base/applications/mspaint/selectionmodel.h | 2 +- base/applications/mspaint/textedit.cpp | 117 +++++++++++++++++++++------ base/applications/mspaint/textedit.h | 5 +- 4 files changed, 97 insertions(+), 28 deletions(-) diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 1137453dd3f..fb28ad5033a 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -18,6 +18,7 @@ SelectionModel::SelectionModel() , m_hbmMask(NULL) , m_ptStack(NULL) , m_iPtSP(0) + , m_rgbBack(RGB(255, 255, 255)) , m_bShow(FALSE) , m_bContentChanged(FALSE) { diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index c2ec6bffbc2..230c87dfdf5 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -18,7 +18,7 @@ private: int m_iPtSP; public: - COLORREF m_rgbBack = RGB(255, 255, 255); + COLORREF m_rgbBack; BOOL m_bShow; BOOL m_bContentChanged; CRect m_rc; // in image pixel coordinates diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 6d84a12c285..8ec1155d1c9 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -200,12 +200,6 @@ LRESULT CTextEditWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CTextEditWindow::OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { LRESULT ret = DefWindowProc(nMsg, wParam, lParam); - - if (m_nAppIsMovingOrSizing == 0) - { - Reposition(); - InvalidateEditRect(); - } return ret; } @@ -218,12 +212,6 @@ LRESULT CTextEditWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b SendMessage(EM_SETRECTNP, 0, (LPARAM)&rc); SendMessage(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0)); - if (m_nAppIsMovingOrSizing == 0) - { - Reposition(); - InvalidateEditRect(); - } - return ret; } @@ -400,27 +388,104 @@ void CTextEditWindow::ValidateEditRect(LPCRECT prc OPTIONAL) --m_nAppIsMovingOrSizing; } -void CTextEditWindow::Reposition() +LRESULT CTextEditWindow::OnMoving(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - CRect rc; - GetWindowRect(&rc); - ::MapWindowPoints(NULL, canvasWindow, (LPPOINT)&rc, 2); - canvasWindow.CanvasToImage(rc); + // Restrict the window position to the image area + LPRECT prcMoving = (LPRECT)lParam; + CRect rcMoving = *prcMoving; CRect rcImage; canvasWindow.GetImageRect(rcImage); + canvasWindow.ImageToCanvas(rcImage); + canvasWindow.MapWindowPoints(NULL, &rcImage); - // FIXME: Smartly restrict the position and size by using WM_WINDOWPOSCHANGING - if (rc.left < 0) - ::OffsetRect(&rc, -rc.left, 0); - if (rc.top < 0) - ::OffsetRect(&rc, 0, -rc.top); + CRect rcWnd; + GetWindowRect(&rcWnd); + INT cx = rcWnd.Width(), cy = rcWnd.Height(); - canvasWindow.ImageToCanvas(rc); + if (rcMoving.left < rcImage.left) + { + rcMoving.left = rcImage.left; + rcMoving.right = rcImage.left + cx; + } + else if (rcMoving.right > rcImage.right) + { + rcMoving.right = rcImage.right; + rcMoving.left = rcImage.right - cx; + } - ++m_nAppIsMovingOrSizing; - MoveWindow(rc.left, rc.top, rc.Width(), rc.Height(), TRUE); - --m_nAppIsMovingOrSizing; + if (rcMoving.top < rcImage.top) + { + rcMoving.top = rcImage.top; + rcMoving.bottom = rcImage.top + cy; + } + else if (rcMoving.bottom > rcImage.bottom) + { + rcMoving.bottom = rcImage.bottom; + rcMoving.top = rcImage.bottom - cy; + } + + *prcMoving = rcMoving; + Invalidate(TRUE); + return TRUE; +} + +LRESULT CTextEditWindow::OnSizing(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + // Restrict the window size to the image area + LPRECT prcSizing = (LPRECT)lParam; + CRect rcSizing = *prcSizing; + + CRect rcImage; + canvasWindow.GetImageRect(rcImage); + canvasWindow.ImageToCanvas(rcImage); + canvasWindow.MapWindowPoints(NULL, &rcImage); + + // Horizontally + switch (wParam) + { + case WMSZ_BOTTOMLEFT: + case WMSZ_LEFT: + case WMSZ_TOPLEFT: + if (rcSizing.left < rcImage.left) + rcSizing.left = rcImage.left; + break; + case WMSZ_BOTTOMRIGHT: + case WMSZ_RIGHT: + case WMSZ_TOPRIGHT: + if (rcSizing.right > rcImage.right) + rcSizing.right = rcImage.right; + break; + case WMSZ_TOP: + case WMSZ_BOTTOM: + default: + break; + } + + // Vertically + switch (wParam) + { + case WMSZ_BOTTOM: + case WMSZ_BOTTOMLEFT: + case WMSZ_BOTTOMRIGHT: + if (rcSizing.bottom > rcImage.bottom) + rcSizing.bottom = rcImage.bottom; + break; + case WMSZ_TOP: + case WMSZ_TOPLEFT: + case WMSZ_TOPRIGHT: + if (rcSizing.top < rcImage.top) + rcSizing.top = rcImage.top; + break; + case WMSZ_LEFT: + case WMSZ_RIGHT: + default: + break; + } + + *prcSizing = rcSizing; + Invalidate(TRUE); + return TRUE; } LRESULT CTextEditWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) diff --git a/base/applications/mspaint/textedit.h b/base/applications/mspaint/textedit.h index 95fb3e6ca45..7060919cae6 100644 --- a/base/applications/mspaint/textedit.h +++ b/base/applications/mspaint/textedit.h @@ -32,6 +32,8 @@ public: MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) MESSAGE_HANDLER(WM_TOOLSMODELZOOMCHANGED, OnToolsModelZoomChanged) MESSAGE_HANDLER(WM_PALETTEMODELCOLORCHANGED, OnPaletteModelColorChanged) + MESSAGE_HANDLER(WM_MOVING, OnMoving) + MESSAGE_HANDLER(WM_SIZING, OnSizing) MESSAGE_HANDLER(WM_CHAR, OnChar) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkGnd) @@ -56,6 +58,8 @@ public: LRESULT OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMoving(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSizing(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnChar(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -82,5 +86,4 @@ protected: INT DoHitTest(RECT& rc, POINT pt); void DrawGrip(HDC hDC, RECT& rc); - void Reposition(); };

1 year, 7 months

[reactos] 01/01: [MSPAINT] Realize context menu on canvas (#5352)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7aadc1e1feaf6cadd5362… commit 7aadc1e1feaf6cadd536223230f461b24619c6d1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 07:51:19 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 19 07:51:19 2023 +0900 [MSPAINT] Realize context menu on canvas (#5352) - Add actions on Right-Click. - Add ID_POPUPMENU resource menu. - Use TrackPopupMenu to show the context menu. - Improve CMainWindow::OnInitMenuPopup to display context menu. - Add SelectionModel::m_bContentChanged flag to indicate whether the selection content is changed. - Fix IDM_IMAGEINVERTCOLORS and IDM_IMAGEROTATEMIRROR commands. CORE-18867 --- base/applications/mspaint/canvas.cpp | 5 ++ base/applications/mspaint/lang/bg-BG.rc | 19 +++++ base/applications/mspaint/lang/cs-CZ.rc | 19 +++++ base/applications/mspaint/lang/de-DE.rc | 19 +++++ base/applications/mspaint/lang/en-GB.rc | 19 +++++ base/applications/mspaint/lang/en-US.rc | 19 +++++ base/applications/mspaint/lang/es-ES.rc | 19 +++++ base/applications/mspaint/lang/et-EE.rc | 19 +++++ base/applications/mspaint/lang/eu-ES.rc | 19 +++++ base/applications/mspaint/lang/fr-FR.rc | 19 +++++ base/applications/mspaint/lang/he-IL.rc | 19 +++++ base/applications/mspaint/lang/hu-HU.rc | 19 +++++ base/applications/mspaint/lang/id-ID.rc | 19 +++++ base/applications/mspaint/lang/it-IT.rc | 19 +++++ base/applications/mspaint/lang/ja-JP.rc | 21 +++++- base/applications/mspaint/lang/nl-NL.rc | 19 +++++ base/applications/mspaint/lang/no-NO.rc | 19 +++++ base/applications/mspaint/lang/pl-PL.rc | 19 +++++ base/applications/mspaint/lang/pt-BR.rc | 19 +++++ base/applications/mspaint/lang/pt-PT.rc | 19 +++++ base/applications/mspaint/lang/ro-RO.rc | 19 +++++ base/applications/mspaint/lang/ru-RU.rc | 19 +++++ base/applications/mspaint/lang/sk-SK.rc | 19 +++++ base/applications/mspaint/lang/sq-AL.rc | 19 +++++ base/applications/mspaint/lang/sv-SE.rc | 19 +++++ base/applications/mspaint/lang/tr-TR.rc | 19 +++++ base/applications/mspaint/lang/uk-UA.rc | 19 +++++ base/applications/mspaint/lang/vi-VN.rc | 19 +++++ base/applications/mspaint/lang/zh-CN.rc | 19 +++++ base/applications/mspaint/lang/zh-HK.rc | 19 +++++ base/applications/mspaint/lang/zh-TW.rc | 19 +++++ base/applications/mspaint/mouse.cpp | 29 ++++++-- base/applications/mspaint/resource.h | 1 + base/applications/mspaint/selectionmodel.cpp | 74 ++++++++++++++----- base/applications/mspaint/selectionmodel.h | 5 ++ base/applications/mspaint/winproc.cpp | 102 +++++++++++++++++---------- base/applications/mspaint/winproc.h | 1 + 37 files changed, 726 insertions(+), 63 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 68a91b5d250..45c182cf3bd 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -272,6 +272,11 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam CanvasToImage(pt); StartSelectionDrag(hitSelection, pt); } + else + { + canvasWindow.ClientToScreen(&pt); + mainWindow.TrackPopupMenu(pt, 0); + } return 0; } diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index e5d1a5eb4b5..8f829673e75 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index e7175cfb789..82cfb95c87a 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index c037f76a5bd..4ac9271762b 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 6275fa87c6e..f60d1580bfb 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index e81466d7177..2db7b63f035 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 313b56435c6..85fc44b03b9 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -102,6 +102,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 3895c6266b1..2f49611d46a 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 1d5565cb184..782c29f274f 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index c2428c63a4a..9067efb323c 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index b5a6e494d7a..1ef77c72fe9 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index c80bcc33d6b..913b4aa4c08 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 312ef62a3de..134bd6cc6a1 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 8d54f0c5c01..72978cacb4e 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 8e6bac2e22e..498c603aa55 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -78,7 +78,7 @@ BEGIN POPUP "画像(&I)" BEGIN MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "伸縮/傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "伸縮と傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "切り取り(&C)", IDM_IMAGECROP MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "画像の属性(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "切り取り(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "コピー(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "貼り付け(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "選択範囲の削除(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "すべて選択(&A)\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "ファイルへコピー(&O)...", IDM_EDITCOPYTO + MENUITEM "ファイルから貼り付け(&F)...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "伸縮と傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 4b3285670bc..aabc54497c9 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 30a2a258863..c8e12864b8f 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 62191b61216..34213677b47 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -101,6 +101,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 28a0e26eaeb..b6e462d741e 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 561a5f774a4..9921db6a996 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^O", IDM_FILENEW diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 4aba57be15f..42c9e2a4169 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -101,6 +101,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index e7b08265148..940044ff0a2 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index d728044f8a2..58ac2345492 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -101,6 +101,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index b749bd24c3a..ad639839f2c 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 79f30dcae74..0aef5bdd6d9 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index d299c5b40ba..d8f0d9e0953 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index d7eb147c950..7a0eafc3873 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 247f547ef17..aa1df3c5488 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 69216e71489..896cfd81663 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -102,6 +102,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 0577111e768..d200513e5d7 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 2c4675630ef..f266ba59d9d 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index b16ae6190b8..2ba45a2d0e2 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -181,6 +181,12 @@ struct FreeSelTool : ToolBase } imageModel.NotifyImageChanged(); } + else + { + POINT pt = { x, y }; + canvasWindow.ClientToScreen(&pt); + mainWindow.TrackPopupMenu(pt, 0); + } } void OnFinishDraw() override @@ -249,14 +255,19 @@ struct RectSelTool : ToolBase void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { + POINT pt = { x, y }; if (bLeftButton) { - POINT pt = { x, y }; imageModel.Bound(pt); selectionModel.SetRectFromPoints(g_ptStart, pt); selectionModel.m_bShow = !selectionModel.m_rc.IsRectEmpty(); imageModel.NotifyImageChanged(); } + else + { + canvasWindow.ClientToScreen(&pt); + mainWindow.TrackPopupMenu(pt, 0); + } } void OnFinishDraw() override @@ -565,10 +576,13 @@ struct TextTool : ToolBase selectionModel.SetRectFromPoints(g_ptStart, pt); BOOL bTextBoxShown = ::IsWindowVisible(textEditWindow); - if (bTextBoxShown && textEditWindow.GetWindowTextLength() > 0) + if (bTextBoxShown) { - imageModel.PushImageForUndo(); - draw(m_hdc); + if (textEditWindow.GetWindowTextLength() > 0) + { + imageModel.PushImageForUndo(); + draw(m_hdc); + } if (::IsRectEmpty(&selectionModel.m_rc)) { quit(); @@ -611,8 +625,11 @@ struct TextTool : ToolBase void OnFinishDraw() override { - imageModel.PushImageForUndo(); - draw(m_hdc); + if (textEditWindow.GetWindowTextLength() > 0) + { + imageModel.PushImageForUndo(); + draw(m_hdc); + } quit(); ToolBase::OnFinishDraw(); } diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 53f17d4c715..ce91b33238b 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -30,6 +30,7 @@ #define IDI_VERTSKEW 538 #define ID_MENU 501 +#define ID_POPUPMENU 502 #define IDM_FILENEW 201 #define IDM_FILEOPEN 202 diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index bfa4501d5fc..1137453dd3f 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -19,6 +19,7 @@ SelectionModel::SelectionModel() , m_ptStack(NULL) , m_iPtSP(0) , m_bShow(FALSE) + , m_bContentChanged(FALSE) { ::SetRectEmpty(&m_rc); ::SetRectEmpty(&m_rcOld); @@ -123,6 +124,14 @@ void SelectionModel::DrawBackgroundRect(HDC hDCImage, COLORREF crBg) Rect(hDCImage, m_rcOld.left, m_rcOld.top, m_rcOld.right, m_rcOld.bottom, crBg, crBg, 0, 1); } +void SelectionModel::DrawBackground(HDC hDCImage) +{ + if (toolsModel.GetActiveTool() == TOOL_FREESEL) + DrawBackgroundPoly(hDCImage, paletteModel.GetBgColor()); + else + DrawBackgroundRect(hDCImage, paletteModel.GetBgColor()); +} + void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTransparent) { CRect rc = m_rc; @@ -187,7 +196,8 @@ void SelectionModel::Landing() m_bShow = FALSE; - if (!::EqualRect(m_rc, m_rcOld) && !::IsRectEmpty(m_rc) && !::IsRectEmpty(m_rcOld)) + if (m_bContentChanged || + (!::EqualRect(m_rc, m_rcOld) && !::IsRectEmpty(m_rc) && !::IsRectEmpty(m_rcOld))) { imageModel.PushImageForUndo(); @@ -208,9 +218,7 @@ void SelectionModel::InsertFromHBITMAP(HBITMAP hBm, INT x, INT y) m_rc.right = x + GetDIBWidth(hBm); m_rc.bottom = y + GetDIBHeight(hBm); - // If m_rc and m_rcOld were same, the image cannot be pasted to the canvas. - // See also SelectionModel::Landing - ::SetRect(&m_rcOld, -2, -2, -1, -1); // Outside of image + NotifyContentChanged(); ClearMask(); } @@ -234,7 +242,7 @@ void SelectionModel::FlipHorizontally() } ::DeleteDC(hdcMem); - imageModel.NotifyImageChanged(); + NotifyContentChanged(); } void SelectionModel::FlipVertically() @@ -256,7 +264,7 @@ void SelectionModel::FlipVertically() } ::DeleteDC(hdcMem); - imageModel.NotifyImageChanged(); + NotifyContentChanged(); } void SelectionModel::RotateNTimes90Degrees(int iN) @@ -267,9 +275,10 @@ void SelectionModel::RotateNTimes90Degrees(int iN) switch (iN) { - case 1: - case 3: + case 1: /* rotate 90 degrees */ + case 3: /* rotate 270 degrees */ TakeOff(); + if (m_hbmColor) { hbmOld = ::SelectObject(hdcMem, m_hbmColor); @@ -286,10 +295,13 @@ void SelectionModel::RotateNTimes90Degrees(int iN) ::DeleteObject(m_hbmMask); m_hbmMask = hbm; } + + SwapWidthAndHeight(); break; - case 2: + case 2: /* rotate 180 degrees */ TakeOff(); + if (m_hbmColor) { hbmOld = ::SelectObject(hdcMem, m_hbmColor); @@ -308,7 +320,7 @@ void SelectionModel::RotateNTimes90Degrees(int iN) } ::DeleteDC(hdcMem); - imageModel.NotifyImageChanged(); + NotifyContentChanged(); } void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY) @@ -351,7 +363,7 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int ::DeleteDC(hDC); m_bShow = TRUE; - imageModel.NotifyImageChanged(); + NotifyContentChanged(); } HBITMAP SelectionModel::CopyBitmap() @@ -442,12 +454,11 @@ void SelectionModel::ClearColor() void SelectionModel::HideSelection() { - m_bShow = FALSE; + m_bShow = m_bContentChanged = FALSE; ClearColor(); ClearMask(); ::SetRectEmpty(&m_rc); ::SetRectEmpty(&m_rcOld); - imageModel.NotifyImageChanged(); } @@ -457,12 +468,39 @@ void SelectionModel::DeleteSelection() return; TakeOff(); - imageModel.PushImageForUndo(); - if (toolsModel.GetActiveTool() == TOOL_FREESEL) - DrawBackgroundPoly(imageModel.GetDC(), paletteModel.GetBgColor()); - else - DrawBackgroundRect(imageModel.GetDC(), paletteModel.GetBgColor()); + DrawBackground(imageModel.GetDC()); HideSelection(); } + +void SelectionModel::InvertSelection() +{ + TakeOff(); + + BITMAP bm; + ::GetObject(m_hbmColor, sizeof(bm), &bm); + + HDC hdc = ::CreateCompatibleDC(NULL); + HGDIOBJ hbmOld = ::SelectObject(hdc, m_hbmColor); + RECT rc = { 0, 0, bm.bmWidth, bm.bmHeight }; + ::InvertRect(hdc, &rc); + ::SelectObject(hdc, hbmOld); + ::DeleteDC(hdc); + + NotifyContentChanged(); +} + +void SelectionModel::NotifyContentChanged() +{ + m_bContentChanged = TRUE; + imageModel.NotifyImageChanged(); +} + +void SelectionModel::SwapWidthAndHeight() +{ + INT cx = m_rc.Width(); + INT cy = m_rc.Height(); + m_rc.right = m_rc.left + cy; + m_rc.bottom = m_rc.top + cx; +} diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index f68a740d18f..c2ec6bffbc2 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -20,6 +20,7 @@ private: public: COLORREF m_rgbBack = RGB(255, 255, 255); BOOL m_bShow; + BOOL m_bContentChanged; CRect m_rc; // in image pixel coordinates POINT m_ptHit; // in image pixel coordinates CRect m_rcOld; // in image pixel coordinates @@ -42,6 +43,7 @@ public: HBITMAP CopyBitmap(); void GetSelectionContents(HDC hDCImage); void DrawFramePoly(HDC hDCImage); + void DrawBackground(HDC hDCImage); void DrawBackgroundPoly(HDC hDCImage, COLORREF crBg); void DrawBackgroundRect(HDC hDCImage, COLORREF crBg); void DrawSelection(HDC hDCImage, COLORREF crBg = 0, BOOL bBgTransparent = FALSE); @@ -52,14 +54,17 @@ public: void FlipVertically(); void RotateNTimes90Degrees(int iN); void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY); + void InvertSelection(); void Dragging(CANVAS_HITTEST hit, POINT pt); void ClearMask(); void ClearColor(); + void NotifyContentChanged(); private: SelectionModel(const SelectionModel&); SelectionModel& operator=(const SelectionModel&); void ShiftPtStack(INT dx, INT dy); + void SwapWidthAndHeight(); }; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index c3fa27d6445..72947626a8c 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -424,47 +424,44 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); DWORD dwStart = 0, dwEnd = 0; - if (::IsWindowVisible(textEditWindow)) + if (textShown) textEditWindow.SendMessage(EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); BOOL hasTextSel = (dwStart < dwEnd); - switch (lParam) + // + // File menu + // + if (::GetSubMenu(GetMenu(), 0) == menu) { - case 0: /* File menu */ - ProcessFileMenu((HMENU)wParam); - break; - case 1: /* 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_EDITCUT, ENABLED_IF(textShown ? hasTextSel : trueSelection)); - EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(textShown ? hasTextSel : trueSelection)); - EnableMenuItem(menu, IDM_EDITDELETESELECTION, - ENABLED_IF(textShown ? hasTextSel : trueSelection)); - EnableMenuItem(menu, IDM_EDITINVERTSELECTION, ENABLED_IF(trueSelection)); - 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))); - break; - case 2: /* View menu */ - CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(::IsWindowVisible(toolBoxContainer))); - CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(::IsWindowVisible(paletteWindow))); - CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(g_hStatusBar))); - CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(::IsWindowVisible(fontsDialog))); - EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); - - CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(g_showGrid)); - CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(registrySettings.ShowThumbnail)); - break; - case 3: /* Image menu */ - EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(selectionModel.m_bShow)); - CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(!toolsModel.IsBackgroundTransparent())); - break; + ProcessFileMenu(menu); } + // + // 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_EDITCUT, ENABLED_IF(textShown ? hasTextSel : trueSelection)); + EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(textShown ? hasTextSel : trueSelection)); + EnableMenuItem(menu, IDM_EDITDELETESELECTION, + ENABLED_IF(textShown ? hasTextSel : trueSelection)); + EnableMenuItem(menu, IDM_EDITINVERTSELECTION, ENABLED_IF(trueSelection)); + 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))); + + // + // View menu + // + CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(::IsWindowVisible(toolBoxContainer))); + CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(::IsWindowVisible(paletteWindow))); + CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(g_hStatusBar))); + CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(::IsWindowVisible(fontsDialog))); + EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); CheckMenuItem(menu, IDM_VIEWZOOM125, CHECKED_IF(toolsModel.GetZoom() == 125)); CheckMenuItem(menu, IDM_VIEWZOOM25, CHECKED_IF(toolsModel.GetZoom() == 250)); CheckMenuItem(menu, IDM_VIEWZOOM50, CHECKED_IF(toolsModel.GetZoom() == 500)); @@ -472,7 +469,19 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO CheckMenuItem(menu, IDM_VIEWZOOM200, CHECKED_IF(toolsModel.GetZoom() == 2000)); CheckMenuItem(menu, IDM_VIEWZOOM400, CHECKED_IF(toolsModel.GetZoom() == 4000)); CheckMenuItem(menu, IDM_VIEWZOOM800, CHECKED_IF(toolsModel.GetZoom() == 8000)); - + CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(g_showGrid)); + CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(registrySettings.ShowThumbnail)); + + // + // Image menu + // + EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(selectionModel.m_bShow)); + EnableMenuItem(menu, IDM_IMAGEDELETEIMAGE, ENABLED_IF(!selectionModel.m_bShow)); + CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(!toolsModel.IsBackgroundTransparent())); + + // + // Palette menu + // CheckMenuItem(menu, IDM_COLORSMODERNPALETTE, CHECKED_IF(paletteModel.SelectedPalette() == PAL_MODERN)); CheckMenuItem(menu, IDM_COLORSOLDPALETTE, CHECKED_IF(paletteModel.SelectedPalette() == PAL_OLDTYPE)); return 0; @@ -858,7 +867,10 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_IMAGEINVERTCOLORS: { - imageModel.InvertColors(); + if (selectionModel.m_bShow) + selectionModel.InvertSelection(); + else + imageModel.InvertColors(); break; } case IDM_IMAGEDELETEIMAGE: @@ -997,8 +1009,22 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH // Create and show the fullscreen window fullscreenWindow.DoCreate(); fullscreenWindow.ShowWindow(SW_SHOWMAXIMIZED); - ShowWindow(SW_HIDE); break; } return 0; } + +VOID CMainWindow::TrackPopupMenu(POINT ptScreen, INT iSubMenu) +{ + HMENU hMenu = ::LoadMenuW(g_hinstExe, MAKEINTRESOURCEW(ID_POPUPMENU)); + HMENU hSubMenu = ::GetSubMenu(hMenu, iSubMenu); + + ::SetForegroundWindow(m_hWnd); + INT_PTR id = ::TrackPopupMenu(hSubMenu, TPM_RIGHTBUTTON | TPM_RETURNCMD, + ptScreen.x, ptScreen.y, 0, m_hWnd, NULL); + PostMessage(WM_NULL); + if (id != 0) + PostMessage(WM_COMMAND, id); + + ::DestroyMenu(hMenu); +} diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/winproc.h index 5ec12f23f0f..71fe89282d2 100644 --- a/base/applications/mspaint/winproc.h +++ b/base/applications/mspaint/winproc.h @@ -34,6 +34,7 @@ public: BOOL GetOpenFileName(IN OUT LPTSTR pszFile, INT cchMaxFile); BOOL GetSaveFileName(IN OUT LPTSTR pszFile, INT cchMaxFile); BOOL ChooseColor(IN OUT COLORREF *prgbColor); + VOID TrackPopupMenu(POINT ptScreen, INT iSubMenu); private: HMENU m_hMenu;

1 year, 7 months

[reactos] 01/01: [NTOS:PNP] Assert the presence of a device extension when handling PnP root power IRPs

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0972f71d9abb1a7e88660… commit 0972f71d9abb1a7e88660cbfbe8e2d564bb1e102 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Fri Jun 16 00:13:30 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jun 18 20:44:13 2023 +0200 [NTOS:PNP] Assert the presence of a device extension when handling PnP root power IRPs Handling PnP root driver power IRPs requires that a device object must come up with a device extension to determine whether it is a function driver and if so, handle the IRP accordingly. CORE-18989 --- ntoskrnl/io/pnpmgr/pnproot.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/io/pnpmgr/pnproot.c b/ntoskrnl/io/pnpmgr/pnproot.c index c41844b64d3..58d740b7d3b 100644 --- a/ntoskrnl/io/pnpmgr/pnproot.c +++ b/ntoskrnl/io/pnpmgr/pnproot.c @@ -1473,6 +1473,12 @@ PnpRootPowerControl( Status = Irp->IoStatus.Status; IrpSp = IoGetCurrentIrpStackLocation(Irp); + /* + * We must handle power IRPs based on whether it is a function driver + * or not from the device extension, so it cannot be NULL. + */ + ASSERT(DeviceExtension); + if (DeviceExtension->Common.IsFDO) { ASSERT(!DeviceExtension->Common.IsFDO);

1 year, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs