Ros-diffs

ros-diffs@reactos.org

12 participants
81028 discussions

[reactos] 01/01: [MSPAINT] Delete winproc.cpp and move code to main.cpp

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf13ebda44c2d5cae4c88… commit bf13ebda44c2d5cae4c882a3129acb3d7b3b46a3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 23 17:13:21 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 23 17:14:32 2023 +0900 [MSPAINT] Delete winproc.cpp and move code to main.cpp Refactoring. This will reduce build time a little. CORE-19094 --- base/applications/mspaint/CMakeLists.txt | 1 - base/applications/mspaint/main.cpp | 1072 ++++++++++++++++++++++++++++- base/applications/mspaint/winproc.cpp | 1082 ------------------------------ 3 files changed, 1071 insertions(+), 1084 deletions(-) diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index d90fea481fd..492f82b4331 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -25,7 +25,6 @@ list(APPEND SOURCE toolbox.cpp toolsettings.cpp toolsmodel.cpp - winproc.cpp precomp.h) file(GLOB mspaint_rc_deps img/*.*) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index dcc3bab80f1..535db5b42c8 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -1,14 +1,17 @@ /* * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) - * PURPOSE: Initializing everything + * PURPOSE: The main window and wWinMain etc. * COPYRIGHT: Copyright 2015 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2017-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2018 Stanislav Motylkov <x86corez(a)gmail.com> */ #include "precomp.h" #include <dlgs.h> #include <mapi.h> +#include <assert.h> BOOL g_askBeforeEnlarging = FALSE; // TODO: initialize from registry HINSTANCE g_hinstExe = NULL; @@ -17,9 +20,15 @@ WCHAR g_szMailTempFile[MAX_LONG_PATH] = { 0 }; BOOL g_isAFile = FALSE; BOOL g_imageSaved = FALSE; BOOL g_showGrid = FALSE; +HWND g_hStatusBar = NULL; CMainWindow mainWindow; +typedef HWND (WINAPI *FN_HtmlHelpW)(HWND, LPCWSTR, UINT, DWORD_PTR); + +static HINSTANCE s_hHHCTRL_OCX = NULL; // HtmlHelpW needs "hhctrl.ocx" +static FN_HtmlHelpW s_pHtmlHelpW = NULL; + /* FUNCTIONS ********************************************************/ void ShowOutOfMemory(void) @@ -308,6 +317,1067 @@ HWND CMainWindow::DoCreate() return Create(HWND_DESKTOP, rc, strTitle, WS_OVERLAPPEDWINDOW, WS_EX_ACCEPTFILES); } +// A wrapper function for HtmlHelpW +static HWND DoHtmlHelpW(HWND hwndCaller, LPCWSTR pszFile, UINT uCommand, DWORD_PTR dwData) +{ + WCHAR szPath[MAX_PATH]; + + if (!s_hHHCTRL_OCX && (uCommand != HH_CLOSE_ALL)) + { + // The function loads the system library, not local + GetSystemDirectoryW(szPath, _countof(szPath)); + StringCchCatW(szPath, _countof(szPath), L"\\hhctrl.ocx"); + s_hHHCTRL_OCX = LoadLibraryW(szPath); + if (s_hHHCTRL_OCX) + s_pHtmlHelpW = (FN_HtmlHelpW)GetProcAddress(s_hHHCTRL_OCX, "HtmlHelpW"); + } + + if (!s_pHtmlHelpW) + return NULL; + + return s_pHtmlHelpW(hwndCaller, pszFile, uCommand, dwData); +} + +void CMainWindow::alignChildrenToMainWindow() +{ + RECT clientRect, rc; + GetClientRect(&clientRect); + RECT rcSpace = clientRect; + const UINT uFlags = (SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOCOPYBITS); + + if (::IsWindowVisible(g_hStatusBar)) + { + ::GetWindowRect(g_hStatusBar, &rc); + rcSpace.bottom -= rc.bottom - rc.top; + } + + HDWP hDWP = ::BeginDeferWindowPos(3); + + if (::IsWindowVisible(toolBoxContainer)) + { + if (registrySettings.Bar2ID == BAR2ID_RIGHT) + { + hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, + rcSpace.right - CX_TOOLBAR, rcSpace.top, + CX_TOOLBAR, rcSpace.bottom - rcSpace.top, + uFlags); + rcSpace.right -= CX_TOOLBAR; + } + else + { + hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, + rcSpace.left, rcSpace.top, + CX_TOOLBAR, rcSpace.bottom - rcSpace.top, + uFlags); + rcSpace.left += CX_TOOLBAR; + } + } + + if (::IsWindowVisible(paletteWindow)) + { + if (registrySettings.Bar1ID == BAR1ID_BOTTOM) + { + hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, + rcSpace.left, rcSpace.bottom - CY_PALETTE, + rcSpace.right - rcSpace.left, CY_PALETTE, + uFlags); + rcSpace.bottom -= CY_PALETTE; + } + else + { + hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, + rcSpace.left, rcSpace.top, + rcSpace.right - rcSpace.left, CY_PALETTE, + uFlags); + rcSpace.top += CY_PALETTE; + } + } + + if (canvasWindow.IsWindow()) + { + hDWP = ::DeferWindowPos(hDWP, canvasWindow, NULL, + rcSpace.left, rcSpace.top, + rcSpace.right - rcSpace.left, rcSpace.bottom - rcSpace.top, + uFlags); + } + + ::EndDeferWindowPos(hDWP); +} + +void CMainWindow::saveImage(BOOL overwrite) +{ + canvasWindow.finishDrawing(); + + // Is the extension not supported? + PWCHAR pchDotExt = PathFindExtensionW(g_szFileName); + if (pchDotExt && *pchDotExt && !CImageDx::IsExtensionSupported(pchDotExt)) + { + // Remove the extension + PathRemoveExtensionW(g_szFileName); + // No overwrite + overwrite = FALSE; + } + + if (g_isAFile && overwrite) + { + imageModel.SaveImage(g_szFileName); + } + else if (GetSaveFileName(g_szFileName, _countof(g_szFileName))) + { + imageModel.SaveImage(g_szFileName); + } +} + +void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) +{ + int width = GetDIBWidth(bitmap); + int height = GetDIBHeight(bitmap); + int curWidth = imageModel.GetWidth(); + int curHeight = imageModel.GetHeight(); + + if (width > curWidth || height > curHeight) + { + BOOL shouldEnlarge = TRUE; + + if (g_askBeforeEnlarging) + { + WCHAR programname[20]; + WCHAR shouldEnlargePromptText[100]; + + ::LoadStringW(g_hinstExe, IDS_PROGRAMNAME, programname, _countof(programname)); + ::LoadStringW(g_hinstExe, IDS_ENLARGEPROMPTTEXT, shouldEnlargePromptText, _countof(shouldEnlargePromptText)); + + switch (MessageBox(shouldEnlargePromptText, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) + { + case IDYES: + break; + case IDNO: + shouldEnlarge = FALSE; + break; + case IDCANCEL: + return; + } + } + + if (shouldEnlarge) + { + if (width > curWidth) + curWidth = width; + + if (height > curHeight) + curHeight = height; + + imageModel.Crop(curWidth, curHeight, 0, 0); + } + } + + toolsModel.SetActiveTool(TOOL_RECTSEL); + + selectionModel.InsertFromHBITMAP(bitmap, 0, 0); + selectionModel.m_bShow = TRUE; + imageModel.NotifyImageChanged(); +} + +LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + INT zDelta = (SHORT)HIWORD(wParam); + + if (::GetKeyState(VK_CONTROL) < 0) // Ctrl+Wheel + { + if (zDelta < 0) + { + if (toolsModel.GetZoom() > MIN_ZOOM) + canvasWindow.zoomTo(toolsModel.GetZoom() / 2); + } + else if (zDelta > 0) + { + if (toolsModel.GetZoom() < MAX_ZOOM) + canvasWindow.zoomTo(toolsModel.GetZoom() * 2); + } + } + else // Wheel only + { + UINT nCount = 3; + if (::GetAsyncKeyState(VK_SHIFT) < 0) + { +#ifndef SPI_GETWHEELSCROLLCHARS + #define SPI_GETWHEELSCROLLCHARS 0x006C // Needed for pre-NT6 PSDK +#endif + SystemParametersInfoW(SPI_GETWHEELSCROLLCHARS, 0, &nCount, 0); + for (UINT i = 0; i < nCount; ++i) + { + if (zDelta < 0) + ::PostMessageW(canvasWindow, WM_HSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0); + else if (zDelta > 0) + ::PostMessageW(canvasWindow, WM_HSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0); + } + } + else + { + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES, 0, &nCount, 0); + for (UINT i = 0; i < nCount; ++i) + { + if (zDelta < 0) + ::PostMessageW(canvasWindow, WM_VSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0); + else if (zDelta > 0) + ::PostMessageW(canvasWindow, WM_VSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0); + } + } + } + + return 0; +} + +LRESULT CMainWindow::OnDropFiles(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + WCHAR droppedfile[MAX_PATH]; + + HDROP hDrop = (HDROP)wParam; + DragQueryFile(hDrop, 0, droppedfile, _countof(droppedfile)); + DragFinish(hDrop); + + ConfirmSave() && DoLoadImageFile(m_hWnd, droppedfile, TRUE); + + return 0; +} + +LRESULT CMainWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + // Loading and setting the window menu from resource + m_hMenu = ::LoadMenuW(g_hinstExe, MAKEINTRESOURCEW(ID_MENU)); + SetMenu(m_hMenu); + + // Create the status bar + DWORD style = SBARS_SIZEGRIP | WS_CHILD | (registrySettings.ShowStatusBar ? WS_VISIBLE : 0); + g_hStatusBar = ::CreateWindowExW(0, STATUSCLASSNAME, NULL, style, 0, 0, 0, 0, m_hWnd, + NULL, g_hinstExe, NULL); + ::SendMessageW(g_hStatusBar, SB_SETMINHEIGHT, 21, 0); + + // Create the tool box + toolBoxContainer.DoCreate(m_hWnd); + + // Create the palette window + RECT rcEmpty = { 0, 0, 0, 0 }; // Rely on WM_SIZE + style = WS_CHILD | (registrySettings.ShowPalette ? WS_VISIBLE : 0); + paletteWindow.Create(m_hWnd, rcEmpty, NULL, style, WS_EX_STATICEDGE); + + // Create the canvas + style = WS_CHILD | WS_GROUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE; + canvasWindow.Create(m_hWnd, rcEmpty, NULL, style, WS_EX_CLIENTEDGE); + + // Create and show the miniature if necessary + if (registrySettings.ShowThumbnail) + { + miniature.DoCreate(m_hWnd); + miniature.ShowWindow(SW_SHOWNOACTIVATE); + } + + // Set icon + SendMessage(WM_SETICON, ICON_BIG, (LPARAM)::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); + SendMessage(WM_SETICON, ICON_SMALL, (LPARAM)::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); + + return 0; +} + +LRESULT CMainWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + registrySettings.WindowPlacement.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(&(registrySettings.WindowPlacement)); + + DoHtmlHelpW(NULL, NULL, HH_CLOSE_ALL, 0); + + if (s_hHHCTRL_OCX) + { + FreeLibrary(s_hHHCTRL_OCX); + s_hHHCTRL_OCX = NULL; + s_pHtmlHelpW = NULL; + } + + SetMenu(NULL); + if (m_hMenu) + { + ::DestroyMenu(m_hMenu); + m_hMenu = NULL; + } + + PostQuitMessage(0); /* send a WM_QUIT to the message queue */ + return 0; +} + +BOOL CMainWindow::ConfirmSave() +{ + canvasWindow.finishDrawing(); + + if (imageModel.IsImageSaved()) + return TRUE; + + CStringW strProgramName; + strProgramName.LoadString(IDS_PROGRAMNAME); + + CStringW strSavePromptText; + strSavePromptText.Format(IDS_SAVEPROMPTTEXT, PathFindFileName(g_szFileName)); + + switch (MessageBox(strSavePromptText, strProgramName, MB_YESNOCANCEL | MB_ICONQUESTION)) + { + case IDYES: + saveImage(TRUE); + return imageModel.IsImageSaved(); + case IDNO: + return TRUE; + case IDCANCEL: + return FALSE; + } + + return TRUE; +} + +LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (ConfirmSave()) + { + DestroyWindow(); + } + return 0; +} + +void CMainWindow::ProcessFileMenu(HMENU hPopupMenu) +{ + LPCWSTR dotext = PathFindExtensionW(g_szFileName); + BOOL isBMP = FALSE; + if (_wcsicmp(dotext, L".bmp") == 0 || + _wcsicmp(dotext, L".dib") == 0 || + _wcsicmp(dotext, L".rle") == 0) + { + isBMP = TRUE; + } + + UINT uWallpaperEnabled = ENABLED_IF(g_isAFile && isBMP && g_fileSize > 0); + ::EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERPLANE, uWallpaperEnabled); + ::EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERCENTERED, uWallpaperEnabled); + ::EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERSTRETCHED, uWallpaperEnabled); + + for (INT iItem = 0; iItem < MAX_RECENT_FILES; ++iItem) + RemoveMenu(hPopupMenu, IDM_FILE1 + iItem, MF_BYCOMMAND); + + if (registrySettings.strFiles[0].IsEmpty()) + return; + + RemoveMenu(hPopupMenu, IDM_FILEMOSTRECENTLYUSEDFILE, MF_BYCOMMAND); + + INT cMenuItems = GetMenuItemCount(hPopupMenu); + + for (INT iItem = 0; iItem < MAX_RECENT_FILES; ++iItem) + { + CStringW& strFile = registrySettings.strFiles[iItem]; + if (strFile.IsEmpty()) + break; + + // Condense the lengthy pathname by using '...' +#define MAX_RECENT_PATHNAME_DISPLAY 30 + CPath pathFile(strFile); + pathFile.CompactPathEx(MAX_RECENT_PATHNAME_DISPLAY); + assert(wcslen((LPCWSTR)pathFile) <= MAX_RECENT_PATHNAME_DISPLAY); + + // Add an accelerator (by '&') to the item number for quick access + WCHAR szText[4 + MAX_RECENT_PATHNAME_DISPLAY + 1]; + StringCchPrintfW(szText, _countof(szText), L"&%u %s", iItem + 1, (LPCWSTR)pathFile); + + INT iMenuItem = (cMenuItems - 2) + iItem; + InsertMenu(hPopupMenu, iMenuItem, MF_BYPOSITION | MF_STRING, IDM_FILE1 + iItem, szText); + } +} + +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::s_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::s_pointSP != 0) + return TRUE; + return imageModel.CanRedo(); +} + +BOOL CMainWindow::CanPaste() const +{ + if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) + return ::IsClipboardFormatAvailable(CF_UNICODETEXT); + + return (::IsClipboardFormatAvailable(CF_ENHMETAFILE) || + ::IsClipboardFormatAvailable(CF_DIB) || + ::IsClipboardFormatAvailable(CF_BITMAP)); +} + +LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + HMENU menu = (HMENU)wParam; + BOOL trueSelection = (selectionModel.m_bShow && toolsModel.IsSelection()); + BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); + DWORD dwStart = 0, dwEnd = 0; + if (textShown) + textEditWindow.SendMessage(EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); + BOOL hasTextSel = (dwStart < dwEnd); + + // + // File menu + // + if (::GetSubMenu(GetMenu(), 0) == menu) + { + ProcessFileMenu(menu); + } + + // + // Edit menu + // + 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, + 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(CanPaste())); + + // + // 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)); + CheckMenuItem(menu, IDM_VIEWZOOM100, CHECKED_IF(toolsModel.GetZoom() == 1000)); + 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; +} + +LRESULT CMainWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; + if (::IsWindow(g_hStatusBar)) + { + ::SendMessageW(g_hStatusBar, WM_SIZE, 0, 0); + ::SendMessageW(g_hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); + } + alignChildrenToMainWindow(); + return 0; +} + +LRESULT CMainWindow::OnGetMinMaxInfo(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + MINMAXINFO *mm = (MINMAXINFO*)lParam; + mm->ptMinTrackSize = { 330, 360 }; + return 0; +} + +LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + HWND hwndCapture; + switch (wParam) + { + case VK_ESCAPE: + hwndCapture = GetCapture(); + if (hwndCapture) + { + if (canvasWindow.m_hWnd == hwndCapture || + fullscreenWindow.m_hWnd == hwndCapture) + { + ::SendMessageW(hwndCapture, nMsg, wParam, lParam); + } + } + else if (selectionModel.m_bShow) + { + selectionModel.HideSelection(); + } + else + { + canvasWindow.cancelDrawing(); + } + break; + + case VK_LEFT: + selectionModel.moveSelection(-1, 0); + break; + case VK_RIGHT: + selectionModel.moveSelection(+1, 0); + break; + case VK_UP: + selectionModel.moveSelection(0, -1); + break; + case VK_DOWN: + selectionModel.moveSelection(0, +1); + break; + default: + break; + } + return 0; +} + +LRESULT CMainWindow::OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + /* Redirect message to common controls */ + HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); + ::SendMessageW(hToolbar, WM_SYSCOLORCHANGE, 0, 0); + return 0; +} + +LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + // Disable commands while dragging mouse + if (canvasWindow.m_drawing && ::GetCapture()) + { + ATLTRACE("locking!\n"); + return 0; + } + + BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); + switch (LOWORD(wParam)) + { + case IDM_HELPINFO: + { + WCHAR infotitle[100], infotext[200]; + ::LoadStringW(g_hinstExe, IDS_INFOTITLE, infotitle, _countof(infotitle)); + ::LoadStringW(g_hinstExe, IDS_INFOTEXT, infotext, _countof(infotext)); + ::ShellAboutW(m_hWnd, infotitle, infotext, + LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); + break; + } + case IDM_HELPHELPTOPICS: + DoHtmlHelpW(m_hWnd, L"%SystemRoot%\\Help\\mspaint.chm", HH_DISPLAY_TOPIC, 0); + break; + case IDM_FILEEXIT: + SendMessage(WM_CLOSE, wParam, lParam); + break; + case IDM_FILENEW: + if (ConfirmSave()) + { + InitializeImage(NULL, NULL, FALSE); + } + break; + case IDM_FILEOPEN: + { + WCHAR szFileName[MAX_LONG_PATH] = L""; + if (ConfirmSave() && GetOpenFileName(szFileName, _countof(szFileName))) + { + DoLoadImageFile(m_hWnd, szFileName, TRUE); + } + break; + } + case IDM_FILESAVE: + saveImage(TRUE); + break; + case IDM_FILESAVEAS: + saveImage(FALSE); + break; + case IDM_FILEPAGESETUP: + // DUMMY: Shows the dialog only, no functionality + PAGESETUPDLG psd; + ZeroMemory(&psd, sizeof(psd)); + psd.lStructSize = sizeof(psd); + psd.hwndOwner = m_hWnd; + PageSetupDlg(&psd); + break; + case IDM_FILEPRINT: + // TODO: Test whether it actually works + PRINTDLG pd; + ZeroMemory(&pd, sizeof(pd)); + pd.lStructSize = sizeof(pd); + pd.hwndOwner = m_hWnd; + pd.hDevMode = NULL; // freed by user + pd.hDevNames = NULL; // freed by user + pd.Flags = PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC; + pd.nCopies = 1; + pd.nFromPage = 0xffff; + pd.nToPage = 0xffff; + pd.nMinPage = 1; + pd.nMaxPage = 0xffff; + if (PrintDlg(&pd) == TRUE) + { + ::BitBlt(pd.hDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), imageModel.GetDC(), 0, 0, SRCCOPY); + DeleteDC(pd.hDC); + } + if (pd.hDevMode) + GlobalFree(pd.hDevMode); + if (pd.hDevNames) + GlobalFree(pd.hDevNames); + break; + case IDM_FILESEND: + canvasWindow.finishDrawing(); + if (!OpenMailer(m_hWnd, g_szFileName)) + { + ShowError(IDS_CANTSENDMAIL); + } + break; + case IDM_FILEASWALLPAPERPLANE: + RegistrySettings::SetWallpaper(g_szFileName, RegistrySettings::TILED); + break; + case IDM_FILEASWALLPAPERCENTERED: + RegistrySettings::SetWallpaper(g_szFileName, RegistrySettings::CENTERED); + break; + case IDM_FILEASWALLPAPERSTRETCHED: + RegistrySettings::SetWallpaper(g_szFileName, RegistrySettings::STRETCHED); + break; + case IDM_FILE1: + case IDM_FILE2: + case IDM_FILE3: + case IDM_FILE4: + { + INT iFile = LOWORD(wParam) - IDM_FILE1; + if (ConfirmSave()) + DoLoadImageFile(m_hWnd, registrySettings.strFiles[iFile], TRUE); + break; + } + case IDM_EDITUNDO: + if (textShown) + { + textEditWindow.PostMessage(WM_UNDO, 0, 0); + break; + } + if (selectionModel.m_bShow) + { + if (toolsModel.IsSelection()) + { + canvasWindow.cancelDrawing(); + if (toolsModel.GetActiveTool() == TOOL_FREESEL || + toolsModel.GetActiveTool() == TOOL_RECTSEL) + { + imageModel.Undo(); + if (selectionModel.m_nSelectionBrush == 2) // Selection Brush is drawn + { + imageModel.Undo(); + selectionModel.m_nSelectionBrush = 0; + } + } + break; + } + } + if (ToolBase::s_pointSP != 0) // drawing something? + { + canvasWindow.cancelDrawing(); + break; + } + imageModel.Undo(); + break; + case IDM_EDITREDO: + if (textShown) + { + // There is no "WM_REDO" in EDIT control + break; + } + if (ToolBase::s_pointSP != 0) // drawing something? + { + canvasWindow.finishDrawing(); + break; + } + imageModel.Redo(); + break; + case IDM_EDITCOPY: + if (textShown) + { + textEditWindow.SendMessage(WM_COPY); + break; + } + if (!selectionModel.m_bShow || !OpenClipboard()) + break; + + EmptyClipboard(); + + selectionModel.TakeOff(); + + { + HBITMAP hbmCopy = selectionModel.GetSelectionContents(); + HGLOBAL hGlobal = BitmapToClipboardDIB(hbmCopy); + if (hGlobal) + ::SetClipboardData(CF_DIB, hGlobal); + else + ShowOutOfMemory(); + ::DeleteObject(hbmCopy); + } + + CloseClipboard(); + break; + case IDM_EDITCUT: + if (textShown) + { + textEditWindow.SendMessage(WM_CUT); + break; + } + /* Copy */ + SendMessage(WM_COMMAND, IDM_EDITCOPY, 0); + /* Delete selection */ + SendMessage(WM_COMMAND, IDM_EDITDELETESELECTION, 0); + break; + case IDM_EDITPASTE: + if (textShown) + { + textEditWindow.SendMessage(WM_PASTE); + break; + } + + if (!OpenClipboard()) + break; + + // In many cases, CF_ENHMETAFILE provides a better image than CF_DIB + if (::IsClipboardFormatAvailable(CF_ENHMETAFILE)) + { + HENHMETAFILE hEMF = (HENHMETAFILE)::GetClipboardData(CF_ENHMETAFILE); + if (hEMF) + { + HBITMAP hbm = BitmapFromHEMF(hEMF); + ::DeleteEnhMetaFile(hEMF); + if (hbm) + { + InsertSelectionFromHBITMAP(hbm, m_hWnd); + CloseClipboard(); + break; + } + } + } + + // In many cases, CF_DIB provides a better image than CF_BITMAP + if (::IsClipboardFormatAvailable(CF_DIB)) + { + HBITMAP hbm = BitmapFromClipboardDIB(::GetClipboardData(CF_DIB)); + if (hbm) + { + InsertSelectionFromHBITMAP(hbm, m_hWnd); + CloseClipboard(); + break; + } + } + + // The last resort + if (::IsClipboardFormatAvailable(CF_BITMAP)) + { + HBITMAP hbm = (HBITMAP)::GetClipboardData(CF_BITMAP); + if (hbm) + { + InsertSelectionFromHBITMAP(hbm, m_hWnd); + CloseClipboard(); + break; + } + } + + // Failed to paste + { + CStringW strText, strTitle; + strText.LoadString(IDS_CANTPASTE); + strTitle.LoadString(IDS_PROGRAMNAME); + MessageBox(strText, strTitle, MB_ICONINFORMATION); + } + + CloseClipboard(); + break; + case IDM_EDITDELETESELECTION: + { + if (textShown) + { + textEditWindow.SendMessage(WM_CLEAR); + break; + } + switch (toolsModel.GetActiveTool()) + { + case TOOL_FREESEL: + case TOOL_RECTSEL: + selectionModel.DeleteSelection(); + break; + + case TOOL_TEXT: + canvasWindow.cancelDrawing(); + break; + default: + break; + } + break; + } + case IDM_EDITSELECTALL: + { + if (textShown) + { + textEditWindow.SendMessage(EM_SETSEL, 0, -1); + break; + } + HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); + ::SendMessageW(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); + toolsModel.selectAll(); + canvasWindow.Invalidate(TRUE); + break; + } + case IDM_EDITCOPYTO: + { + WCHAR szFileName[MAX_LONG_PATH]; + ::LoadStringW(g_hinstExe, IDS_DEFAULTFILENAME, szFileName, _countof(szFileName)); + if (GetSaveFileName(szFileName, _countof(szFileName))) + { + HBITMAP hbmSelection = selectionModel.GetSelectionContents(); + if (!hbmSelection) + { + ShowOutOfMemory(); + break; + } + SaveDIBToFile(hbmSelection, szFileName, FALSE); + DeleteObject(hbmSelection); + } + break; + } + case IDM_EDITPASTEFROM: + { + WCHAR szFileName[MAX_LONG_PATH] = L""; + if (GetOpenFileName(szFileName, _countof(szFileName))) + { + HBITMAP hbmNew = DoLoadImageFile(m_hWnd, szFileName, FALSE); + if (hbmNew) + InsertSelectionFromHBITMAP(hbmNew, m_hWnd); + } + break; + } + case IDM_COLORSEDITPALETTE: + { + COLORREF rgbColor = paletteModel.GetFgColor(); + if (ChooseColor(&rgbColor)) + paletteModel.SetFgColor(rgbColor); + break; + } + case IDM_COLORSMODERNPALETTE: + paletteModel.SelectPalette(PAL_MODERN); + break; + case IDM_COLORSOLDPALETTE: + paletteModel.SelectPalette(PAL_OLDTYPE); + break; + case IDM_IMAGEINVERTCOLORS: + { + if (selectionModel.m_bShow) + selectionModel.InvertSelection(); + else + imageModel.InvertColors(); + break; + } + case IDM_IMAGEDELETEIMAGE: + imageModel.PushImageForUndo(); + Rect(imageModel.GetDC(), 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); + imageModel.NotifyImageChanged(); + break; + case IDM_IMAGEROTATEMIRROR: + { + CWaitCursor waitCursor; + canvasWindow.updateScrollPos(); + switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) + { + case 1: /* flip horizontally */ + { + if (selectionModel.m_bShow) + selectionModel.FlipHorizontally(); + else + imageModel.FlipHorizontally(); + break; + } + case 2: /* flip vertically */ + { + if (selectionModel.m_bShow) + selectionModel.FlipVertically(); + else + imageModel.FlipVertically(); + break; + } + case 3: /* rotate 90 degrees */ + { + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(1); + else + imageModel.RotateNTimes90Degrees(1); + break; + } + case 4: /* rotate 180 degrees */ + { + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(2); + else + imageModel.RotateNTimes90Degrees(2); + break; + } + case 5: /* rotate 270 degrees */ + { + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(3); + else + imageModel.RotateNTimes90Degrees(3); + break; + } + } + } + break; + case IDM_IMAGEATTRIBUTES: + { + if (attributesDialog.DoModal(mainWindow.m_hWnd)) + { + CWaitCursor waitCursor; + if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite()) + { + CStringW strText(MAKEINTRESOURCEW(IDS_LOSECOLOR)); + CStringW strTitle(MAKEINTRESOURCEW(IDS_PROGRAMNAME)); + INT id = MessageBox(strText, strTitle, MB_ICONINFORMATION | MB_YESNOCANCEL); + if (id != IDYES) + break; + + imageModel.PushBlackAndWhite(); + } + + if (imageModel.GetWidth() != attributesDialog.newWidth || + imageModel.GetHeight() != attributesDialog.newHeight) + { + imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight); + } + } + break; + } + case IDM_IMAGESTRETCHSKEW: + { + if (stretchSkewDialog.DoModal(mainWindow.m_hWnd)) + { + CWaitCursor waitCursor; + if (selectionModel.m_bShow) + { + selectionModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, + stretchSkewDialog.angle.x, stretchSkewDialog.angle.y); + } + else + { + imageModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, + stretchSkewDialog.angle.x, stretchSkewDialog.angle.y); + } + } + break; + } + case IDM_IMAGEDRAWOPAQUE: + toolsModel.SetBackgroundTransparent(!toolsModel.IsBackgroundTransparent()); + break; + case IDM_IMAGECROP: + { + HBITMAP hbmCopy = selectionModel.GetSelectionContents(); + imageModel.PushImageForUndo(hbmCopy); + selectionModel.HideSelection(); + break; + } + case IDM_VIEWTOOLBOX: + registrySettings.ShowToolBox = !toolBoxContainer.IsWindowVisible(); + toolBoxContainer.ShowWindow(registrySettings.ShowToolBox ? SW_SHOWNOACTIVATE : SW_HIDE); + alignChildrenToMainWindow(); + break; + case IDM_VIEWCOLORPALETTE: + registrySettings.ShowPalette = !paletteWindow.IsWindowVisible(); + paletteWindow.ShowWindow(registrySettings.ShowPalette ? SW_SHOWNOACTIVATE : SW_HIDE); + alignChildrenToMainWindow(); + break; + case IDM_VIEWSTATUSBAR: + registrySettings.ShowStatusBar = !::IsWindowVisible(g_hStatusBar); + ::ShowWindow(g_hStatusBar, (registrySettings.ShowStatusBar ? SW_SHOWNOACTIVATE : SW_HIDE)); + alignChildrenToMainWindow(); + break; + case IDM_FORMATICONBAR: + if (toolsModel.GetActiveTool() == TOOL_TEXT) + { + if (!fontsDialog.IsWindow()) + { + fontsDialog.Create(mainWindow); + } + registrySettings.ShowTextTool = !::IsWindowVisible(fontsDialog); + fontsDialog.ShowWindow(registrySettings.ShowTextTool ? SW_SHOW : SW_HIDE); + fontsDialog.SendMessage(DM_REPOSITION, 0, 0); + } + break; + case IDM_VIEWSHOWGRID: + g_showGrid = !g_showGrid; + canvasWindow.Invalidate(FALSE); + break; + case IDM_VIEWSHOWMINIATURE: + registrySettings.ShowThumbnail = !::IsWindowVisible(miniature); + miniature.DoCreate(m_hWnd); + miniature.ShowWindow(registrySettings.ShowThumbnail ? SW_SHOWNOACTIVATE : SW_HIDE); + break; + + case IDM_VIEWZOOM125: + canvasWindow.zoomTo(125); + break; + case IDM_VIEWZOOM25: + canvasWindow.zoomTo(250); + break; + case IDM_VIEWZOOM50: + canvasWindow.zoomTo(500); + break; + case IDM_VIEWZOOM100: + canvasWindow.zoomTo(1000); + break; + case IDM_VIEWZOOM200: + canvasWindow.zoomTo(2000); + break; + case IDM_VIEWZOOM400: + canvasWindow.zoomTo(4000); + break; + case IDM_VIEWZOOM800: + canvasWindow.zoomTo(8000); + break; + + case IDM_VIEWFULLSCREEN: + // Create and show the fullscreen window + fullscreenWindow.DoCreate(); + fullscreenWindow.ShowWindow(SW_SHOWMAXIMIZED); + break; + + case IDM_CTRL_PLUS: + toolsModel.SpecialTweak(FALSE); + break; + case IDM_CTRL_MINUS: + toolsModel.SpecialTweak(TRUE); + 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); +} + // entry point INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nCmdShow) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp deleted file mode 100644 index 0a280d95755..00000000000 --- a/base/applications/mspaint/winproc.cpp +++ /dev/null @@ -1,1082 +0,0 @@ -/* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) - * PURPOSE: Window procedure of the main window and all children apart from - * hPalWin, hToolSettings and hSelection - * COPYRIGHT: Copyright 2015 Benedikt Freisen <b.freisen(a)gmx.net> - * Copyright 2017-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - * Copyright 2018 Stanislav Motylkov <x86corez(a)gmail.com> - */ - -#include "precomp.h" -#include <assert.h> - -typedef HWND (WINAPI *FN_HtmlHelpW)(HWND, LPCWSTR, UINT, DWORD_PTR); - -static HINSTANCE s_hHHCTRL_OCX = NULL; // HtmlHelpW needs "hhctrl.ocx" -static FN_HtmlHelpW s_pHtmlHelpW = NULL; - -HWND g_hStatusBar = NULL; - -/* FUNCTIONS ********************************************************/ - -// A wrapper function for HtmlHelpW -static HWND DoHtmlHelpW(HWND hwndCaller, LPCWSTR pszFile, UINT uCommand, DWORD_PTR dwData) -{ - WCHAR szPath[MAX_PATH]; - - if (!s_hHHCTRL_OCX && (uCommand != HH_CLOSE_ALL)) - { - // The function loads the system library, not local - GetSystemDirectoryW(szPath, _countof(szPath)); - StringCchCatW(szPath, _countof(szPath), L"\\hhctrl.ocx"); - s_hHHCTRL_OCX = LoadLibraryW(szPath); - if (s_hHHCTRL_OCX) - s_pHtmlHelpW = (FN_HtmlHelpW)GetProcAddress(s_hHHCTRL_OCX, "HtmlHelpW"); - } - - if (!s_pHtmlHelpW) - return NULL; - - return s_pHtmlHelpW(hwndCaller, pszFile, uCommand, dwData); -} - -void CMainWindow::alignChildrenToMainWindow() -{ - RECT clientRect, rc; - GetClientRect(&clientRect); - RECT rcSpace = clientRect; - const UINT uFlags = (SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOCOPYBITS); - - if (::IsWindowVisible(g_hStatusBar)) - { - ::GetWindowRect(g_hStatusBar, &rc); - rcSpace.bottom -= rc.bottom - rc.top; - } - - HDWP hDWP = ::BeginDeferWindowPos(3); - - if (::IsWindowVisible(toolBoxContainer)) - { - if (registrySettings.Bar2ID == BAR2ID_RIGHT) - { - hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, - rcSpace.right - CX_TOOLBAR, rcSpace.top, - CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - uFlags); - rcSpace.right -= CX_TOOLBAR; - } - else - { - hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, - rcSpace.left, rcSpace.top, - CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - uFlags); - rcSpace.left += CX_TOOLBAR; - } - } - - if (::IsWindowVisible(paletteWindow)) - { - if (registrySettings.Bar1ID == BAR1ID_BOTTOM) - { - hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, - rcSpace.left, rcSpace.bottom - CY_PALETTE, - rcSpace.right - rcSpace.left, CY_PALETTE, - uFlags); - rcSpace.bottom -= CY_PALETTE; - } - else - { - hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, - rcSpace.left, rcSpace.top, - rcSpace.right - rcSpace.left, CY_PALETTE, - uFlags); - rcSpace.top += CY_PALETTE; - } - } - - if (canvasWindow.IsWindow()) - { - hDWP = ::DeferWindowPos(hDWP, canvasWindow, NULL, - rcSpace.left, rcSpace.top, - rcSpace.right - rcSpace.left, rcSpace.bottom - rcSpace.top, - uFlags); - } - - ::EndDeferWindowPos(hDWP); -} - -void CMainWindow::saveImage(BOOL overwrite) -{ - canvasWindow.finishDrawing(); - - // Is the extension not supported? - PWCHAR pchDotExt = PathFindExtensionW(g_szFileName); - if (pchDotExt && *pchDotExt && !CImageDx::IsExtensionSupported(pchDotExt)) - { - // Remove the extension - PathRemoveExtensionW(g_szFileName); - // No overwrite - overwrite = FALSE; - } - - if (g_isAFile && overwrite) - { - imageModel.SaveImage(g_szFileName); - } - else if (GetSaveFileName(g_szFileName, _countof(g_szFileName))) - { - imageModel.SaveImage(g_szFileName); - } -} - -void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) -{ - int width = GetDIBWidth(bitmap); - int height = GetDIBHeight(bitmap); - int curWidth = imageModel.GetWidth(); - int curHeight = imageModel.GetHeight(); - - if (width > curWidth || height > curHeight) - { - BOOL shouldEnlarge = TRUE; - - if (g_askBeforeEnlarging) - { - WCHAR programname[20]; - WCHAR shouldEnlargePromptText[100]; - - ::LoadStringW(g_hinstExe, IDS_PROGRAMNAME, programname, _countof(programname)); - ::LoadStringW(g_hinstExe, IDS_ENLARGEPROMPTTEXT, shouldEnlargePromptText, _countof(shouldEnlargePromptText)); - - switch (MessageBox(shouldEnlargePromptText, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) - { - case IDYES: - break; - case IDNO: - shouldEnlarge = FALSE; - break; - case IDCANCEL: - return; - } - } - - if (shouldEnlarge) - { - if (width > curWidth) - curWidth = width; - - if (height > curHeight) - curHeight = height; - - imageModel.Crop(curWidth, curHeight, 0, 0); - } - } - - toolsModel.SetActiveTool(TOOL_RECTSEL); - - selectionModel.InsertFromHBITMAP(bitmap, 0, 0); - selectionModel.m_bShow = TRUE; - imageModel.NotifyImageChanged(); -} - -LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - INT zDelta = (SHORT)HIWORD(wParam); - - if (::GetKeyState(VK_CONTROL) < 0) // Ctrl+Wheel - { - if (zDelta < 0) - { - if (toolsModel.GetZoom() > MIN_ZOOM) - canvasWindow.zoomTo(toolsModel.GetZoom() / 2); - } - else if (zDelta > 0) - { - if (toolsModel.GetZoom() < MAX_ZOOM) - canvasWindow.zoomTo(toolsModel.GetZoom() * 2); - } - } - else // Wheel only - { - UINT nCount = 3; - if (::GetAsyncKeyState(VK_SHIFT) < 0) - { -#ifndef SPI_GETWHEELSCROLLCHARS - #define SPI_GETWHEELSCROLLCHARS 0x006C // Needed for pre-NT6 PSDK -#endif - SystemParametersInfoW(SPI_GETWHEELSCROLLCHARS, 0, &nCount, 0); - for (UINT i = 0; i < nCount; ++i) - { - if (zDelta < 0) - ::PostMessageW(canvasWindow, WM_HSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0); - else if (zDelta > 0) - ::PostMessageW(canvasWindow, WM_HSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0); - } - } - else - { - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES, 0, &nCount, 0); - for (UINT i = 0; i < nCount; ++i) - { - if (zDelta < 0) - ::PostMessageW(canvasWindow, WM_VSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0); - else if (zDelta > 0) - ::PostMessageW(canvasWindow, WM_VSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0); - } - } - } - - return 0; -} - -LRESULT CMainWindow::OnDropFiles(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - WCHAR droppedfile[MAX_PATH]; - - HDROP hDrop = (HDROP)wParam; - DragQueryFile(hDrop, 0, droppedfile, _countof(droppedfile)); - DragFinish(hDrop); - - ConfirmSave() && DoLoadImageFile(m_hWnd, droppedfile, TRUE); - - return 0; -} - -LRESULT CMainWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - // Loading and setting the window menu from resource - m_hMenu = ::LoadMenuW(g_hinstExe, MAKEINTRESOURCEW(ID_MENU)); - SetMenu(m_hMenu); - - // Create the status bar - DWORD style = SBARS_SIZEGRIP | WS_CHILD | (registrySettings.ShowStatusBar ? WS_VISIBLE : 0); - g_hStatusBar = ::CreateWindowExW(0, STATUSCLASSNAME, NULL, style, 0, 0, 0, 0, m_hWnd, - NULL, g_hinstExe, NULL); - ::SendMessageW(g_hStatusBar, SB_SETMINHEIGHT, 21, 0); - - // Create the tool box - toolBoxContainer.DoCreate(m_hWnd); - - // Create the palette window - RECT rcEmpty = { 0, 0, 0, 0 }; // Rely on WM_SIZE - style = WS_CHILD | (registrySettings.ShowPalette ? WS_VISIBLE : 0); - paletteWindow.Create(m_hWnd, rcEmpty, NULL, style, WS_EX_STATICEDGE); - - // Create the canvas - style = WS_CHILD | WS_GROUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE; - canvasWindow.Create(m_hWnd, rcEmpty, NULL, style, WS_EX_CLIENTEDGE); - - // Create and show the miniature if necessary - if (registrySettings.ShowThumbnail) - { - miniature.DoCreate(m_hWnd); - miniature.ShowWindow(SW_SHOWNOACTIVATE); - } - - // Set icon - SendMessage(WM_SETICON, ICON_BIG, (LPARAM)::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); - SendMessage(WM_SETICON, ICON_SMALL, (LPARAM)::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); - - return 0; -} - -LRESULT CMainWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - registrySettings.WindowPlacement.length = sizeof(WINDOWPLACEMENT); - GetWindowPlacement(&(registrySettings.WindowPlacement)); - - DoHtmlHelpW(NULL, NULL, HH_CLOSE_ALL, 0); - - if (s_hHHCTRL_OCX) - { - FreeLibrary(s_hHHCTRL_OCX); - s_hHHCTRL_OCX = NULL; - s_pHtmlHelpW = NULL; - } - - SetMenu(NULL); - if (m_hMenu) - { - ::DestroyMenu(m_hMenu); - m_hMenu = NULL; - } - - PostQuitMessage(0); /* send a WM_QUIT to the message queue */ - return 0; -} - -BOOL CMainWindow::ConfirmSave() -{ - canvasWindow.finishDrawing(); - - if (imageModel.IsImageSaved()) - return TRUE; - - CStringW strProgramName; - strProgramName.LoadString(IDS_PROGRAMNAME); - - CStringW strSavePromptText; - strSavePromptText.Format(IDS_SAVEPROMPTTEXT, PathFindFileName(g_szFileName)); - - switch (MessageBox(strSavePromptText, strProgramName, MB_YESNOCANCEL | MB_ICONQUESTION)) - { - case IDYES: - saveImage(TRUE); - return imageModel.IsImageSaved(); - case IDNO: - return TRUE; - case IDCANCEL: - return FALSE; - } - - return TRUE; -} - -LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if (ConfirmSave()) - { - DestroyWindow(); - } - return 0; -} - -void CMainWindow::ProcessFileMenu(HMENU hPopupMenu) -{ - LPCWSTR dotext = PathFindExtensionW(g_szFileName); - BOOL isBMP = FALSE; - if (_wcsicmp(dotext, L".bmp") == 0 || - _wcsicmp(dotext, L".dib") == 0 || - _wcsicmp(dotext, L".rle") == 0) - { - isBMP = TRUE; - } - - UINT uWallpaperEnabled = ENABLED_IF(g_isAFile && isBMP && g_fileSize > 0); - ::EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERPLANE, uWallpaperEnabled); - ::EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERCENTERED, uWallpaperEnabled); - ::EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERSTRETCHED, uWallpaperEnabled); - - for (INT iItem = 0; iItem < MAX_RECENT_FILES; ++iItem) - RemoveMenu(hPopupMenu, IDM_FILE1 + iItem, MF_BYCOMMAND); - - if (registrySettings.strFiles[0].IsEmpty()) - return; - - RemoveMenu(hPopupMenu, IDM_FILEMOSTRECENTLYUSEDFILE, MF_BYCOMMAND); - - INT cMenuItems = GetMenuItemCount(hPopupMenu); - - for (INT iItem = 0; iItem < MAX_RECENT_FILES; ++iItem) - { - CStringW& strFile = registrySettings.strFiles[iItem]; - if (strFile.IsEmpty()) - break; - - // Condense the lengthy pathname by using '...' -#define MAX_RECENT_PATHNAME_DISPLAY 30 - CPath pathFile(strFile); - pathFile.CompactPathEx(MAX_RECENT_PATHNAME_DISPLAY); - assert(wcslen((LPCWSTR)pathFile) <= MAX_RECENT_PATHNAME_DISPLAY); - - // Add an accelerator (by '&') to the item number for quick access - WCHAR szText[4 + MAX_RECENT_PATHNAME_DISPLAY + 1]; - StringCchPrintfW(szText, _countof(szText), L"&%u %s", iItem + 1, (LPCWSTR)pathFile); - - INT iMenuItem = (cMenuItems - 2) + iItem; - InsertMenu(hPopupMenu, iMenuItem, MF_BYPOSITION | MF_STRING, IDM_FILE1 + iItem, szText); - } -} - -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::s_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::s_pointSP != 0) - return TRUE; - return imageModel.CanRedo(); -} - -BOOL CMainWindow::CanPaste() const -{ - if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) - return ::IsClipboardFormatAvailable(CF_UNICODETEXT); - - return (::IsClipboardFormatAvailable(CF_ENHMETAFILE) || - ::IsClipboardFormatAvailable(CF_DIB) || - ::IsClipboardFormatAvailable(CF_BITMAP)); -} - -LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - HMENU menu = (HMENU)wParam; - BOOL trueSelection = (selectionModel.m_bShow && toolsModel.IsSelection()); - BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); - DWORD dwStart = 0, dwEnd = 0; - if (textShown) - textEditWindow.SendMessage(EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); - BOOL hasTextSel = (dwStart < dwEnd); - - // - // File menu - // - if (::GetSubMenu(GetMenu(), 0) == menu) - { - ProcessFileMenu(menu); - } - - // - // Edit menu - // - 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, - 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(CanPaste())); - - // - // 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)); - CheckMenuItem(menu, IDM_VIEWZOOM100, CHECKED_IF(toolsModel.GetZoom() == 1000)); - 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; -} - -LRESULT CMainWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; - if (::IsWindow(g_hStatusBar)) - { - ::SendMessageW(g_hStatusBar, WM_SIZE, 0, 0); - ::SendMessageW(g_hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); - } - alignChildrenToMainWindow(); - return 0; -} - -LRESULT CMainWindow::OnGetMinMaxInfo(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - MINMAXINFO *mm = (MINMAXINFO*)lParam; - mm->ptMinTrackSize = { 330, 360 }; - return 0; -} - -LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - HWND hwndCapture; - switch (wParam) - { - case VK_ESCAPE: - hwndCapture = GetCapture(); - if (hwndCapture) - { - if (canvasWindow.m_hWnd == hwndCapture || - fullscreenWindow.m_hWnd == hwndCapture) - { - ::SendMessageW(hwndCapture, nMsg, wParam, lParam); - } - } - else if (selectionModel.m_bShow) - { - selectionModel.HideSelection(); - } - else - { - canvasWindow.cancelDrawing(); - } - break; - - case VK_LEFT: - selectionModel.moveSelection(-1, 0); - break; - case VK_RIGHT: - selectionModel.moveSelection(+1, 0); - break; - case VK_UP: - selectionModel.moveSelection(0, -1); - break; - case VK_DOWN: - selectionModel.moveSelection(0, +1); - break; - default: - break; - } - return 0; -} - -LRESULT CMainWindow::OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - /* Redirect message to common controls */ - HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); - ::SendMessageW(hToolbar, WM_SYSCOLORCHANGE, 0, 0); - return 0; -} - -LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - // Disable commands while dragging mouse - if (canvasWindow.m_drawing && ::GetCapture()) - { - ATLTRACE("locking!\n"); - return 0; - } - - BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); - switch (LOWORD(wParam)) - { - case IDM_HELPINFO: - { - WCHAR infotitle[100], infotext[200]; - ::LoadStringW(g_hinstExe, IDS_INFOTITLE, infotitle, _countof(infotitle)); - ::LoadStringW(g_hinstExe, IDS_INFOTEXT, infotext, _countof(infotext)); - ::ShellAboutW(m_hWnd, infotitle, infotext, - LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); - break; - } - case IDM_HELPHELPTOPICS: - DoHtmlHelpW(m_hWnd, L"%SystemRoot%\\Help\\mspaint.chm", HH_DISPLAY_TOPIC, 0); - break; - case IDM_FILEEXIT: - SendMessage(WM_CLOSE, wParam, lParam); - break; - case IDM_FILENEW: - if (ConfirmSave()) - { - InitializeImage(NULL, NULL, FALSE); - } - break; - case IDM_FILEOPEN: - { - WCHAR szFileName[MAX_LONG_PATH] = L""; - if (ConfirmSave() && GetOpenFileName(szFileName, _countof(szFileName))) - { - DoLoadImageFile(m_hWnd, szFileName, TRUE); - } - break; - } - case IDM_FILESAVE: - saveImage(TRUE); - break; - case IDM_FILESAVEAS: - saveImage(FALSE); - break; - case IDM_FILEPAGESETUP: - // DUMMY: Shows the dialog only, no functionality - PAGESETUPDLG psd; - ZeroMemory(&psd, sizeof(psd)); - psd.lStructSize = sizeof(psd); - psd.hwndOwner = m_hWnd; - PageSetupDlg(&psd); - break; - case IDM_FILEPRINT: - // TODO: Test whether it actually works - PRINTDLG pd; - ZeroMemory(&pd, sizeof(pd)); - pd.lStructSize = sizeof(pd); - pd.hwndOwner = m_hWnd; - pd.hDevMode = NULL; // freed by user - pd.hDevNames = NULL; // freed by user - pd.Flags = PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC; - pd.nCopies = 1; - pd.nFromPage = 0xffff; - pd.nToPage = 0xffff; - pd.nMinPage = 1; - pd.nMaxPage = 0xffff; - if (PrintDlg(&pd) == TRUE) - { - ::BitBlt(pd.hDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), imageModel.GetDC(), 0, 0, SRCCOPY); - DeleteDC(pd.hDC); - } - if (pd.hDevMode) - GlobalFree(pd.hDevMode); - if (pd.hDevNames) - GlobalFree(pd.hDevNames); - break; - case IDM_FILESEND: - canvasWindow.finishDrawing(); - if (!OpenMailer(m_hWnd, g_szFileName)) - { - ShowError(IDS_CANTSENDMAIL); - } - break; - case IDM_FILEASWALLPAPERPLANE: - RegistrySettings::SetWallpaper(g_szFileName, RegistrySettings::TILED); - break; - case IDM_FILEASWALLPAPERCENTERED: - RegistrySettings::SetWallpaper(g_szFileName, RegistrySettings::CENTERED); - break; - case IDM_FILEASWALLPAPERSTRETCHED: - RegistrySettings::SetWallpaper(g_szFileName, RegistrySettings::STRETCHED); - break; - case IDM_FILE1: - case IDM_FILE2: - case IDM_FILE3: - case IDM_FILE4: - { - INT iFile = LOWORD(wParam) - IDM_FILE1; - if (ConfirmSave()) - DoLoadImageFile(m_hWnd, registrySettings.strFiles[iFile], TRUE); - break; - } - case IDM_EDITUNDO: - if (textShown) - { - textEditWindow.PostMessage(WM_UNDO, 0, 0); - break; - } - if (selectionModel.m_bShow) - { - if (toolsModel.IsSelection()) - { - canvasWindow.cancelDrawing(); - if (toolsModel.GetActiveTool() == TOOL_FREESEL || - toolsModel.GetActiveTool() == TOOL_RECTSEL) - { - imageModel.Undo(); - if (selectionModel.m_nSelectionBrush == 2) // Selection Brush is drawn - { - imageModel.Undo(); - selectionModel.m_nSelectionBrush = 0; - } - } - break; - } - } - if (ToolBase::s_pointSP != 0) // drawing something? - { - canvasWindow.cancelDrawing(); - break; - } - imageModel.Undo(); - break; - case IDM_EDITREDO: - if (textShown) - { - // There is no "WM_REDO" in EDIT control - break; - } - if (ToolBase::s_pointSP != 0) // drawing something? - { - canvasWindow.finishDrawing(); - break; - } - imageModel.Redo(); - break; - case IDM_EDITCOPY: - if (textShown) - { - textEditWindow.SendMessage(WM_COPY); - break; - } - if (!selectionModel.m_bShow || !OpenClipboard()) - break; - - EmptyClipboard(); - - selectionModel.TakeOff(); - - { - HBITMAP hbmCopy = selectionModel.GetSelectionContents(); - HGLOBAL hGlobal = BitmapToClipboardDIB(hbmCopy); - if (hGlobal) - ::SetClipboardData(CF_DIB, hGlobal); - else - ShowOutOfMemory(); - ::DeleteObject(hbmCopy); - } - - CloseClipboard(); - break; - case IDM_EDITCUT: - if (textShown) - { - textEditWindow.SendMessage(WM_CUT); - break; - } - /* Copy */ - SendMessage(WM_COMMAND, IDM_EDITCOPY, 0); - /* Delete selection */ - SendMessage(WM_COMMAND, IDM_EDITDELETESELECTION, 0); - break; - case IDM_EDITPASTE: - if (textShown) - { - textEditWindow.SendMessage(WM_PASTE); - break; - } - - if (!OpenClipboard()) - break; - - // In many cases, CF_ENHMETAFILE provides a better image than CF_DIB - if (::IsClipboardFormatAvailable(CF_ENHMETAFILE)) - { - HENHMETAFILE hEMF = (HENHMETAFILE)::GetClipboardData(CF_ENHMETAFILE); - if (hEMF) - { - HBITMAP hbm = BitmapFromHEMF(hEMF); - ::DeleteEnhMetaFile(hEMF); - if (hbm) - { - InsertSelectionFromHBITMAP(hbm, m_hWnd); - CloseClipboard(); - break; - } - } - } - - // In many cases, CF_DIB provides a better image than CF_BITMAP - if (::IsClipboardFormatAvailable(CF_DIB)) - { - HBITMAP hbm = BitmapFromClipboardDIB(::GetClipboardData(CF_DIB)); - if (hbm) - { - InsertSelectionFromHBITMAP(hbm, m_hWnd); - CloseClipboard(); - break; - } - } - - // The last resort - if (::IsClipboardFormatAvailable(CF_BITMAP)) - { - HBITMAP hbm = (HBITMAP)::GetClipboardData(CF_BITMAP); - if (hbm) - { - InsertSelectionFromHBITMAP(hbm, m_hWnd); - CloseClipboard(); - break; - } - } - - // Failed to paste - { - CStringW strText, strTitle; - strText.LoadString(IDS_CANTPASTE); - strTitle.LoadString(IDS_PROGRAMNAME); - MessageBox(strText, strTitle, MB_ICONINFORMATION); - } - - CloseClipboard(); - break; - case IDM_EDITDELETESELECTION: - { - if (textShown) - { - textEditWindow.SendMessage(WM_CLEAR); - break; - } - switch (toolsModel.GetActiveTool()) - { - case TOOL_FREESEL: - case TOOL_RECTSEL: - selectionModel.DeleteSelection(); - break; - - case TOOL_TEXT: - canvasWindow.cancelDrawing(); - break; - default: - break; - } - break; - } - case IDM_EDITSELECTALL: - { - if (textShown) - { - textEditWindow.SendMessage(EM_SETSEL, 0, -1); - break; - } - HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); - ::SendMessageW(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); - toolsModel.selectAll(); - canvasWindow.Invalidate(TRUE); - break; - } - case IDM_EDITCOPYTO: - { - WCHAR szFileName[MAX_LONG_PATH]; - ::LoadStringW(g_hinstExe, IDS_DEFAULTFILENAME, szFileName, _countof(szFileName)); - if (GetSaveFileName(szFileName, _countof(szFileName))) - { - HBITMAP hbmSelection = selectionModel.GetSelectionContents(); - if (!hbmSelection) - { - ShowOutOfMemory(); - break; - } - SaveDIBToFile(hbmSelection, szFileName, FALSE); - DeleteObject(hbmSelection); - } - break; - } - case IDM_EDITPASTEFROM: - { - WCHAR szFileName[MAX_LONG_PATH] = L""; - if (GetOpenFileName(szFileName, _countof(szFileName))) - { - HBITMAP hbmNew = DoLoadImageFile(m_hWnd, szFileName, FALSE); - if (hbmNew) - InsertSelectionFromHBITMAP(hbmNew, m_hWnd); - } - break; - } - case IDM_COLORSEDITPALETTE: - { - COLORREF rgbColor = paletteModel.GetFgColor(); - if (ChooseColor(&rgbColor)) - paletteModel.SetFgColor(rgbColor); - break; - } - case IDM_COLORSMODERNPALETTE: - paletteModel.SelectPalette(PAL_MODERN); - break; - case IDM_COLORSOLDPALETTE: - paletteModel.SelectPalette(PAL_OLDTYPE); - break; - case IDM_IMAGEINVERTCOLORS: - { - if (selectionModel.m_bShow) - selectionModel.InvertSelection(); - else - imageModel.InvertColors(); - break; - } - case IDM_IMAGEDELETEIMAGE: - imageModel.PushImageForUndo(); - Rect(imageModel.GetDC(), 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); - imageModel.NotifyImageChanged(); - break; - case IDM_IMAGEROTATEMIRROR: - { - CWaitCursor waitCursor; - canvasWindow.updateScrollPos(); - switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) - { - case 1: /* flip horizontally */ - { - if (selectionModel.m_bShow) - selectionModel.FlipHorizontally(); - else - imageModel.FlipHorizontally(); - break; - } - case 2: /* flip vertically */ - { - if (selectionModel.m_bShow) - selectionModel.FlipVertically(); - else - imageModel.FlipVertically(); - break; - } - case 3: /* rotate 90 degrees */ - { - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(1); - else - imageModel.RotateNTimes90Degrees(1); - break; - } - case 4: /* rotate 180 degrees */ - { - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(2); - else - imageModel.RotateNTimes90Degrees(2); - break; - } - case 5: /* rotate 270 degrees */ - { - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(3); - else - imageModel.RotateNTimes90Degrees(3); - break; - } - } - } - break; - case IDM_IMAGEATTRIBUTES: - { - if (attributesDialog.DoModal(mainWindow.m_hWnd)) - { - CWaitCursor waitCursor; - if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite()) - { - CStringW strText(MAKEINTRESOURCEW(IDS_LOSECOLOR)); - CStringW strTitle(MAKEINTRESOURCEW(IDS_PROGRAMNAME)); - INT id = MessageBox(strText, strTitle, MB_ICONINFORMATION | MB_YESNOCANCEL); - if (id != IDYES) - break; - - imageModel.PushBlackAndWhite(); - } - - if (imageModel.GetWidth() != attributesDialog.newWidth || - imageModel.GetHeight() != attributesDialog.newHeight) - { - imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight); - } - } - break; - } - case IDM_IMAGESTRETCHSKEW: - { - if (stretchSkewDialog.DoModal(mainWindow.m_hWnd)) - { - CWaitCursor waitCursor; - if (selectionModel.m_bShow) - { - selectionModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, - stretchSkewDialog.angle.x, stretchSkewDialog.angle.y); - } - else - { - imageModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, - stretchSkewDialog.angle.x, stretchSkewDialog.angle.y); - } - } - break; - } - case IDM_IMAGEDRAWOPAQUE: - toolsModel.SetBackgroundTransparent(!toolsModel.IsBackgroundTransparent()); - break; - case IDM_IMAGECROP: - { - HBITMAP hbmCopy = selectionModel.GetSelectionContents(); - imageModel.PushImageForUndo(hbmCopy); - selectionModel.HideSelection(); - break; - } - case IDM_VIEWTOOLBOX: - registrySettings.ShowToolBox = !toolBoxContainer.IsWindowVisible(); - toolBoxContainer.ShowWindow(registrySettings.ShowToolBox ? SW_SHOWNOACTIVATE : SW_HIDE); - alignChildrenToMainWindow(); - break; - case IDM_VIEWCOLORPALETTE: - registrySettings.ShowPalette = !paletteWindow.IsWindowVisible(); - paletteWindow.ShowWindow(registrySettings.ShowPalette ? SW_SHOWNOACTIVATE : SW_HIDE); - alignChildrenToMainWindow(); - break; - case IDM_VIEWSTATUSBAR: - registrySettings.ShowStatusBar = !::IsWindowVisible(g_hStatusBar); - ::ShowWindow(g_hStatusBar, (registrySettings.ShowStatusBar ? SW_SHOWNOACTIVATE : SW_HIDE)); - alignChildrenToMainWindow(); - break; - case IDM_FORMATICONBAR: - if (toolsModel.GetActiveTool() == TOOL_TEXT) - { - if (!fontsDialog.IsWindow()) - { - fontsDialog.Create(mainWindow); - } - registrySettings.ShowTextTool = !::IsWindowVisible(fontsDialog); - fontsDialog.ShowWindow(registrySettings.ShowTextTool ? SW_SHOW : SW_HIDE); - fontsDialog.SendMessage(DM_REPOSITION, 0, 0); - } - break; - case IDM_VIEWSHOWGRID: - g_showGrid = !g_showGrid; - canvasWindow.Invalidate(FALSE); - break; - case IDM_VIEWSHOWMINIATURE: - registrySettings.ShowThumbnail = !::IsWindowVisible(miniature); - miniature.DoCreate(m_hWnd); - miniature.ShowWindow(registrySettings.ShowThumbnail ? SW_SHOWNOACTIVATE : SW_HIDE); - break; - - case IDM_VIEWZOOM125: - canvasWindow.zoomTo(125); - break; - case IDM_VIEWZOOM25: - canvasWindow.zoomTo(250); - break; - case IDM_VIEWZOOM50: - canvasWindow.zoomTo(500); - break; - case IDM_VIEWZOOM100: - canvasWindow.zoomTo(1000); - break; - case IDM_VIEWZOOM200: - canvasWindow.zoomTo(2000); - break; - case IDM_VIEWZOOM400: - canvasWindow.zoomTo(4000); - break; - case IDM_VIEWZOOM800: - canvasWindow.zoomTo(8000); - break; - - case IDM_VIEWFULLSCREEN: - // Create and show the fullscreen window - fullscreenWindow.DoCreate(); - fullscreenWindow.ShowWindow(SW_SHOWMAXIMIZED); - break; - - case IDM_CTRL_PLUS: - toolsModel.SpecialTweak(FALSE); - break; - case IDM_CTRL_MINUS: - toolsModel.SpecialTweak(TRUE); - 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); -}

1 year, 1 month

[reactos] 01/01: [MSPAINT] Rename winproc.h as main.h

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af4a3fac7d2c6aadc39c5… commit af4a3fac7d2c6aadc39c5001bdbd2c1913d982f1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 23 17:06:32 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 23 17:06:32 2023 +0900 [MSPAINT] Rename winproc.h as main.h Refactoring. CORE-19094 --- base/applications/mspaint/{winproc.h => main.h} | 4 ++-- base/applications/mspaint/precomp.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/main.h similarity index 94% rename from base/applications/mspaint/winproc.h rename to base/applications/mspaint/main.h index 8f3595bcacb..c58290552de 100644 --- a/base/applications/mspaint/winproc.h +++ b/base/applications/mspaint/main.h @@ -1,9 +1,9 @@ /* * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) - * PURPOSE: Window procedure of the main window and all children apart from - * hPalWin, hToolSettings and hSelection + * PURPOSE: The main window * COPYRIGHT: Copyright 2015 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #pragma once diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 6f22eb69e8d..8d1aaf0f608 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -47,7 +47,7 @@ #include "toolbox.h" #include "toolsettings.h" #include "toolsmodel.h" -#include "winproc.h" +#include "main.h" #include "dialogs.h" #include <ui/CWaitCursor.h> #include "globalvar.h"

1 year, 1 month

[reactos] 01/01: [MSPAINT] Simplify mouse.cpp with deleting ctors

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c20b4ca29e826f78f5b8c… commit c20b4ca29e826f78f5b8cfb3cce8a60d7aebbd2c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 23 16:46:40 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 23 16:46:40 2023 +0900 [MSPAINT] Simplify mouse.cpp with deleting ctors Refactoring. CORE-19094 --- base/applications/mspaint/mouse.cpp | 72 ------------------------------------- 1 file changed, 72 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 0ef737c338f..a496d085fc9 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -128,10 +128,6 @@ struct FreeSelTool : ToolBase { BOOL m_bLeftButton = FALSE; - FreeSelTool() - { - } - void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) @@ -218,10 +214,6 @@ struct RectSelTool : ToolBase { BOOL m_bLeftButton = FALSE; - RectSelTool() - { - } - void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) @@ -300,10 +292,6 @@ struct TwoPointDrawTool : ToolBase BOOL m_bLeftButton = FALSE; BOOL m_bDrawing = FALSE; - TwoPointDrawTool(TOOLTYPE type) - { - } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { m_bLeftButton = bLeftButton; @@ -440,10 +428,6 @@ struct SmoothDrawTool : ToolBase BOOL m_bShiftDown = FALSE; BOOL m_bLeftButton = FALSE; - SmoothDrawTool(TOOLTYPE type) - { - } - virtual void OnDraw(HDC hdc, BOOL bLeftButton, POINT pt0, POINT pt1) = 0; void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override @@ -512,10 +496,6 @@ struct SmoothDrawTool : ToolBase // TOOL_RUBBER struct RubberTool : SmoothDrawTool { - RubberTool() : SmoothDrawTool(TOOL_RUBBER) - { - } - void OnDraw(HDC hdc, BOOL bLeftButton, POINT pt0, POINT pt1) override { if (bLeftButton) @@ -533,10 +513,6 @@ struct RubberTool : SmoothDrawTool // TOOL_FILL struct FillTool : ToolBase { - FillTool() - { - } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { imageModel.PushImageForUndo(); @@ -547,10 +523,6 @@ struct FillTool : ToolBase // TOOL_COLOR struct ColorTool : ToolBase { - ColorTool() - { - } - void fetchColor(BOOL bLeftButton, LONG x, LONG y) { COLORREF rgbColor; @@ -585,10 +557,6 @@ struct ZoomTool : ToolBase { BOOL m_bZoomed = FALSE; - ZoomTool() - { - } - BOOL getNewZoomRect(CRect& rcView, INT newZoom); void OnDrawOverlayOnCanvas(HDC hdc) override @@ -647,10 +615,6 @@ BOOL ZoomTool::getNewZoomRect(CRect& rcView, INT newZoom) // TOOL_PEN struct PenTool : SmoothDrawTool { - PenTool() : SmoothDrawTool(TOOL_PEN) - { - } - void OnDraw(HDC hdc, BOOL bLeftButton, POINT pt0, POINT pt1) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; @@ -666,10 +630,6 @@ struct PenTool : SmoothDrawTool // TOOL_BRUSH struct BrushTool : SmoothDrawTool { - BrushTool() : SmoothDrawTool(TOOL_BRUSH) - { - } - void OnDraw(HDC hdc, BOOL bLeftButton, POINT pt0, POINT pt1) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; @@ -688,10 +648,6 @@ struct AirBrushTool : SmoothDrawTool { DWORD m_dwTick = 0; - AirBrushTool() : SmoothDrawTool(TOOL_AIRBRUSH) - { - } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { m_dwTick = GetTickCount(); @@ -719,10 +675,6 @@ struct AirBrushTool : SmoothDrawTool // TOOL_TEXT struct TextTool : ToolBase { - TextTool() - { - } - void OnDrawOverlayOnImage(HDC hdc) override { if (canvasWindow.m_drawing) @@ -852,10 +804,6 @@ struct TextTool : ToolBase // TOOL_LINE struct LineTool : TwoPointDrawTool { - LineTool() : TwoPointDrawTool(TOOL_LINE) - { - } - void OnDrawOverlayOnImage(HDC hdc) override { if (!m_bDrawing) @@ -872,10 +820,6 @@ struct BezierTool : ToolBase { BOOL m_bLeftButton = FALSE; - BezierTool() - { - } - void OnDrawOverlayOnImage(HDC hdc) { COLORREF rgb = (m_bLeftButton ? m_fg : m_bg); @@ -951,10 +895,6 @@ struct BezierTool : ToolBase // TOOL_RECT struct RectTool : TwoPointDrawTool { - RectTool() : TwoPointDrawTool(TOOL_RECT) - { - } - void OnDrawOverlayOnImage(HDC hdc) override { if (!m_bDrawing) @@ -974,10 +914,6 @@ struct ShapeTool : ToolBase BOOL m_bLeftButton = FALSE; BOOL m_bClosed = FALSE; - ShapeTool() - { - } - void OnDrawOverlayOnImage(HDC hdc) { if (s_pointSP <= 0) @@ -1070,10 +1006,6 @@ struct ShapeTool : ToolBase // TOOL_ELLIPSE struct EllipseTool : TwoPointDrawTool { - EllipseTool() : TwoPointDrawTool(TOOL_ELLIPSE) - { - } - void OnDrawOverlayOnImage(HDC hdc) override { if (!m_bDrawing) @@ -1090,10 +1022,6 @@ struct EllipseTool : TwoPointDrawTool // TOOL_RRECT struct RRectTool : TwoPointDrawTool { - RRectTool() : TwoPointDrawTool(TOOL_RRECT) - { - } - void OnDrawOverlayOnImage(HDC hdc) override { if (!m_bDrawing)

1 year, 1 month

[reactos] 01/01: [MSPAINT] ToolBase::m_tool is not used. Delete it

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96e48dcd01a413c7a939e… commit 96e48dcd01a413c7a939e666823c899f92a0b9d7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 23 16:37:13 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 23 16:37:13 2023 +0900 [MSPAINT] ToolBase::m_tool is not used. Delete it Refactoring. CORE-19094 --- base/applications/mspaint/mouse.cpp | 20 ++++++++++---------- base/applications/mspaint/toolsmodel.h | 3 +-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 8ca0415f226..0ef737c338f 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -128,7 +128,7 @@ struct FreeSelTool : ToolBase { BOOL m_bLeftButton = FALSE; - FreeSelTool() : ToolBase(TOOL_FREESEL) + FreeSelTool() { } @@ -218,7 +218,7 @@ struct RectSelTool : ToolBase { BOOL m_bLeftButton = FALSE; - RectSelTool() : ToolBase(TOOL_RECTSEL) + RectSelTool() { } @@ -300,7 +300,7 @@ struct TwoPointDrawTool : ToolBase BOOL m_bLeftButton = FALSE; BOOL m_bDrawing = FALSE; - TwoPointDrawTool(TOOLTYPE type) : ToolBase(type) + TwoPointDrawTool(TOOLTYPE type) { } @@ -440,7 +440,7 @@ struct SmoothDrawTool : ToolBase BOOL m_bShiftDown = FALSE; BOOL m_bLeftButton = FALSE; - SmoothDrawTool(TOOLTYPE type) : ToolBase(type) + SmoothDrawTool(TOOLTYPE type) { } @@ -533,7 +533,7 @@ struct RubberTool : SmoothDrawTool // TOOL_FILL struct FillTool : ToolBase { - FillTool() : ToolBase(TOOL_FILL) + FillTool() { } @@ -547,7 +547,7 @@ struct FillTool : ToolBase // TOOL_COLOR struct ColorTool : ToolBase { - ColorTool() : ToolBase(TOOL_COLOR) + ColorTool() { } @@ -585,7 +585,7 @@ struct ZoomTool : ToolBase { BOOL m_bZoomed = FALSE; - ZoomTool() : ToolBase(TOOL_ZOOM) + ZoomTool() { } @@ -719,7 +719,7 @@ struct AirBrushTool : SmoothDrawTool // TOOL_TEXT struct TextTool : ToolBase { - TextTool() : ToolBase(TOOL_TEXT) + TextTool() { } @@ -872,7 +872,7 @@ struct BezierTool : ToolBase { BOOL m_bLeftButton = FALSE; - BezierTool() : ToolBase(TOOL_BEZIER) + BezierTool() { } @@ -974,7 +974,7 @@ struct ShapeTool : ToolBase BOOL m_bLeftButton = FALSE; BOOL m_bClosed = FALSE; - ShapeTool() : ToolBase(TOOL_SHAPE) + ShapeTool() { } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 903ac33f632..668c7820bb3 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -40,12 +40,11 @@ enum BrushStyle struct ToolBase { - TOOLTYPE m_tool; HDC m_hdc; COLORREF m_fg, m_bg; static SIZE_T s_pointSP; - ToolBase(TOOLTYPE tool) : m_tool(tool), m_hdc(NULL) { } + ToolBase() : m_hdc(NULL) { } virtual ~ToolBase() { } virtual void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { }

1 year, 1 month

[reactos] 01/01: [MSPAINT] Simplify RECT/CRect handling

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1aeebfdacb8af8854af52… commit 1aeebfdacb8af8854af52c3733ccaa3396c0aafd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 23 15:01:29 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 23 15:19:50 2023 +0900 [MSPAINT] Simplify RECT/CRect handling Refactoring. CORE-19094 --- base/applications/mspaint/canvas.cpp | 34 ++++++++++++------------- base/applications/mspaint/drawing.cpp | 3 +-- base/applications/mspaint/history.cpp | 2 +- base/applications/mspaint/mouse.cpp | 18 +++++++------- base/applications/mspaint/palette.cpp | 2 +- base/applications/mspaint/selectionmodel.cpp | 37 +++++++++++++--------------- base/applications/mspaint/sizebox.cpp | 10 ++++---- base/applications/mspaint/textedit.cpp | 8 +++--- base/applications/mspaint/toolsettings.cpp | 36 +++++++++++++-------------- base/applications/mspaint/toolsettings.h | 2 +- 10 files changed, 74 insertions(+), 78 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 8a010603305..cf529e0f67d 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -18,7 +18,7 @@ CCanvasWindow::CCanvasWindow() , m_ptOrig { -1, -1 } { m_ahbmCached[0] = m_ahbmCached[1] = NULL; - ::SetRectEmpty(&m_rcResizing); + m_rcResizing.SetRectEmpty(); } CCanvasWindow::~CCanvasWindow() @@ -34,7 +34,7 @@ RECT CCanvasWindow::GetBaseRect() CRect rcBase; GetImageRect(rcBase); ImageToCanvas(rcBase); - ::InflateRect(&rcBase, GRIP_SIZE, GRIP_SIZE); + rcBase.InflateRect(GRIP_SIZE, GRIP_SIZE); return rcBase; } @@ -87,8 +87,8 @@ VOID CCanvasWindow::getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget) INT oldZoom = toolsModel.GetZoom(); GetClientRect(rcView); LONG cxView = rcView.right * oldZoom / newZoom, cyView = rcView.bottom * oldZoom / newZoom; - ::SetRect(&rcView, ptTarget.x - cxView / 2, ptTarget.y - cyView / 2, - ptTarget.x + cxView / 2, ptTarget.y + cyView / 2); + rcView.SetRect(ptTarget.x - cxView / 2, ptTarget.y - cyView / 2, + ptTarget.x + cxView / 2, ptTarget.y + cyView / 2); // Shift the rectangle if necessary INT dx = 0, dy = 0; @@ -199,7 +199,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) toolsModel.OnDrawOverlayOnCanvas(hdcMem0); // Draw new frame on hdcMem0 if any - if (m_hitCanvasSizeBox != HIT_NONE && !::IsRectEmpty(&m_rcResizing)) + if (m_hitCanvasSizeBox != HIT_NONE && !m_rcResizing.IsRectEmpty()) DrawXorRect(hdcMem0, &m_rcResizing); // Transfer the bits (hDC <-- hdcMem0) @@ -434,11 +434,11 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL if (!m_drawing) { - RECT rcImage; + CRect rcImage; GetImageRect(rcImage); CStringW strCoord; - if (::PtInRect(&rcImage, pt)) + if (rcImage.PtInRect(pt)) strCoord.Format(L"%ld, %ld", pt.x, pt.y); ::SendMessageW(g_hStatusBar, SB_SETTEXT, 1, (LPARAM)(LPCWSTR)strCoord); } @@ -507,19 +507,19 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL switch (m_hitCanvasSizeBox) { case HIT_UPPER_LEFT: - ::OffsetRect(&rcResizing, cxDelta, cyDelta); + rcResizing.OffsetRect(cxDelta, cyDelta); break; case HIT_UPPER_CENTER: - ::OffsetRect(&rcResizing, 0, cyDelta); + rcResizing.OffsetRect(0, cyDelta); break; case HIT_UPPER_RIGHT: - ::OffsetRect(&rcResizing, 0, cyDelta); + rcResizing.OffsetRect(0, cyDelta); break; case HIT_MIDDLE_LEFT: - ::OffsetRect(&rcResizing, cxDelta, 0); + rcResizing.OffsetRect(cxDelta, 0); break; case HIT_LOWER_LEFT: - ::OffsetRect(&rcResizing, cxDelta, 0); + rcResizing.OffsetRect(cxDelta, 0); break; default: break; @@ -591,7 +591,7 @@ LRESULT CCanvasWindow::OnButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& default: break; } - ::SetRectEmpty(&m_rcResizing); + m_rcResizing.SetRectEmpty(); g_imageSaved = FALSE; @@ -623,7 +623,7 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL CRect rcClient; GetClientRect(&rcClient); - if (!::PtInRect(&rcClient, pt)) + if (!rcClient.PtInRect(pt)) { bHandled = FALSE; return 0; @@ -641,7 +641,7 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL GetImageRect(rcImage); ImageToCanvas(rcImage); - if (::PtInRect(&rcImage, pt)) + if (rcImage.PtInRect(pt)) { switch (toolsModel.GetActiveTool()) { @@ -680,7 +680,7 @@ LRESULT CCanvasWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& ::ReleaseCapture(); m_nMouseDownMsg = 0; m_hitCanvasSizeBox = HIT_NONE; - ::SetRectEmpty(&m_rcResizing); + m_rcResizing.SetRectEmpty(); Invalidate(TRUE); } @@ -691,7 +691,7 @@ LRESULT CCanvasWindow::OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO { // Cancel dragging m_hitCanvasSizeBox = HIT_NONE; - ::SetRectEmpty(&m_rcResizing); + m_rcResizing.SetRectEmpty(); Invalidate(TRUE); return 0; } diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 77d78d465b4..53047096fb4 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -257,8 +257,7 @@ Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCW { INT iSaveDC = ::SaveDC(hdc); // We will modify the clipping region. Save now. - RECT rc; - ::SetRect(&rc, x1, y1, x2, y2); + CRect rc = { x1, y1, x2, y2 }; if (style == 0) // Transparent { diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 2f7480b5f45..696e02656c2 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -354,7 +354,7 @@ void ImageModel::UnlockBitmap(HBITMAP hbmLocked) void ImageModel::SelectionClone(BOOL bUndoable) { - if (!selectionModel.m_bShow || ::IsRectEmpty(&selectionModel.m_rc)) + if (!selectionModel.m_bShow || selectionModel.m_rc.IsRectEmpty()) return; if (bUndoable) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 69a016b4395..8ca0415f226 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -229,8 +229,8 @@ struct RectSelTool : ToolBase if (canvasWindow.m_drawing) { - RECT rc = selectionModel.m_rc; - if (!::IsRectEmpty(&rc)) + CRect& rc = selectionModel.m_rc; + if (!rc.IsRectEmpty()) RectSel(hdc, rc.left, rc.top, rc.right, rc.bottom); } } @@ -727,8 +727,8 @@ struct TextTool : ToolBase { if (canvasWindow.m_drawing) { - RECT rc = selectionModel.m_rc; - if (!::IsRectEmpty(&rc)) + CRect& rc = selectionModel.m_rc; + if (!rc.IsRectEmpty()) RectSel(hdc, rc.left, rc.top, rc.right, rc.bottom); } } @@ -760,10 +760,10 @@ struct TextTool : ToolBase CStringW szText; textEditWindow.GetWindowText(szText); - RECT rc; + CRect rc; textEditWindow.InvalidateEditRect(); textEditWindow.GetEditRect(&rc); - ::InflateRect(&rc, -GRIP_SIZE / 2, -GRIP_SIZE / 2); + rc.InflateRect(-GRIP_SIZE / 2, -GRIP_SIZE / 2); // Draw the text INT style = (toolsModel.IsBackgroundTransparent() ? 0 : 1); @@ -792,7 +792,7 @@ struct TextTool : ToolBase imageModel.PushImageForUndo(); draw(m_hdc); } - if (::IsRectEmpty(&selectionModel.m_rc)) + if (selectionModel.m_rc.IsRectEmpty()) { quit(); return TRUE; @@ -807,13 +807,13 @@ struct TextTool : ToolBase fontsDialog.ShowWindow(SW_SHOWNOACTIVATE); } - RECT rc = selectionModel.m_rc; + CRect rc = selectionModel.m_rc; // Enlarge if tool small INT cxMin = CX_MINTEXTEDIT, cyMin = CY_MINTEXTEDIT; if (selectionModel.m_rc.IsRectEmpty()) { - SetRect(&rc, x, y, x + cxMin, y + cyMin); + rc.SetRect(x, y, x + cxMin, y + cyMin); } else { diff --git a/base/applications/mspaint/palette.cpp b/base/applications/mspaint/palette.cpp index bc08223b848..6e48df5d563 100644 --- a/base/applications/mspaint/palette.cpp +++ b/base/applications/mspaint/palette.cpp @@ -93,7 +93,7 @@ LRESULT CPaletteWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b ::FillRect(hMemDC, &rcClient, (HBRUSH)(COLOR_3DFACE + 1)); /* Draw the big box that contains the black box and the white box */ - ::SetRect(&rc, X_MARGIN, Y_MARGIN, X_MARGIN + CXY_BIGBOX, Y_MARGIN + CXY_BIGBOX); + rc = { X_MARGIN, Y_MARGIN, X_MARGIN + CXY_BIGBOX, Y_MARGIN + CXY_BIGBOX }; ::DrawEdge(hMemDC, &rc, EDGE_SUNKEN, BF_RECT | BF_ADJUST); COLORREF rgbLight = ::GetSysColor(COLOR_3DHIGHLIGHT); for (INT y = rc.top; y < rc.bottom; ++y) diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index a1ab20626b8..ee18b521188 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -21,8 +21,8 @@ SelectionModel::SelectionModel() , m_bShow(FALSE) , m_bContentChanged(FALSE) { - ::SetRectEmpty(&m_rc); - ::SetRectEmpty(&m_rcOld); + m_rc.SetRectEmpty(); + m_rcOld.SetRectEmpty(); m_ptHit = { -1, -1 }; } @@ -97,7 +97,7 @@ void SelectionModel::BuildMaskFromPtStack() void SelectionModel::DrawBackgroundPoly(HDC hDCImage, COLORREF crBg) { - if (::IsRectEmpty(&m_rcOld)) + if (m_rcOld.IsRectEmpty()) return; HGDIOBJ hPenOld = ::SelectObject(hDCImage, ::GetStockObject(NULL_PEN)); @@ -109,7 +109,7 @@ void SelectionModel::DrawBackgroundPoly(HDC hDCImage, COLORREF crBg) void SelectionModel::DrawBackgroundRect(HDC hDCImage, COLORREF crBg) { - if (::IsRectEmpty(&m_rcOld)) + if (m_rcOld.IsRectEmpty()) return; Rect(hDCImage, m_rcOld.left, m_rcOld.top, m_rcOld.right, m_rcOld.bottom, crBg, crBg, 0, 1); @@ -126,7 +126,7 @@ void SelectionModel::DrawBackground(HDC hDCImage) void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTransparent) { CRect rc = m_rc; - if (::IsRectEmpty(&rc)) + if (rc.IsRectEmpty()) return; BITMAP bm; @@ -161,7 +161,7 @@ BOOL SelectionModel::IsLanded() const BOOL SelectionModel::TakeOff() { - if (!IsLanded() || ::IsRectEmpty(&m_rc)) + if (!IsLanded() || m_rc.IsRectEmpty()) return FALSE; // The background color is needed for transparency of selection @@ -204,7 +204,7 @@ void SelectionModel::Landing() m_bShow = FALSE; if (m_bContentChanged || - (!::EqualRect(m_rc, m_rcOld) && !::IsRectEmpty(m_rc) && !::IsRectEmpty(m_rcOld))) + (!m_rc.EqualRect(m_rcOld) && !m_rc.IsRectEmpty() && !m_rcOld.IsRectEmpty())) { imageModel.PushImageForUndo(); @@ -410,10 +410,8 @@ void SelectionModel::DrawFramePoly(HDC hDCImage) void SelectionModel::SetRectFromPoints(const POINT& ptFrom, const POINT& ptTo) { - m_rc.left = min(ptFrom.x, ptTo.x); - m_rc.top = min(ptFrom.y, ptTo.y); - m_rc.right = max(ptFrom.x, ptTo.x); - m_rc.bottom = max(ptFrom.y, ptTo.y); + m_rc = CRect(ptFrom, ptTo); + m_rc.NormalizeRect(); } void SelectionModel::Dragging(HITTEST hit, POINT pt) @@ -452,7 +450,7 @@ void SelectionModel::Dragging(HITTEST hit, POINT pt) break; case HIT_BORDER: case HIT_INNER: - OffsetRect(&m_rc, pt.x - m_ptHit.x, pt.y - m_ptHit.y); + m_rc.OffsetRect(pt.x - m_ptHit.x, pt.y - m_ptHit.y); break; } m_ptHit = pt; @@ -481,8 +479,8 @@ void SelectionModel::HideSelection() m_bShow = m_bContentChanged = FALSE; ClearColorImage(); ClearMaskImage(); - ::SetRectEmpty(&m_rc); - ::SetRectEmpty(&m_rcOld); + m_rc.SetRectEmpty(); + m_rcOld.SetRectEmpty(); imageModel.NotifyImageChanged(); } @@ -533,9 +531,9 @@ HITTEST SelectionModel::hitTest(POINT ptCanvas) if (!m_bShow) return HIT_NONE; - RECT rcSelection = m_rc; + CRect rcSelection = m_rc; canvasWindow.ImageToCanvas(rcSelection); - ::InflateRect(&rcSelection, GRIP_SIZE, GRIP_SIZE); + rcSelection.InflateRect(GRIP_SIZE, GRIP_SIZE); return getSizeBoxHitTest(ptCanvas, &rcSelection); } @@ -544,10 +542,9 @@ void SelectionModel::drawFrameOnCanvas(HDC hCanvasDC) if (!m_bShow) return; - RECT rcSelection = m_rc; + CRect rcSelection = m_rc; canvasWindow.ImageToCanvas(rcSelection); - - ::InflateRect(&rcSelection, GRIP_SIZE, GRIP_SIZE); + rcSelection.InflateRect(GRIP_SIZE, GRIP_SIZE); drawSizeBoxes(hCanvasDC, &rcSelection, TRUE); } @@ -557,7 +554,7 @@ void SelectionModel::moveSelection(INT xDelta, INT yDelta) return; TakeOff(); - ::OffsetRect(&m_rc, xDelta, yDelta); + m_rc.OffsetRect(xDelta, yDelta); canvasWindow.Invalidate(); } diff --git a/base/applications/mspaint/sizebox.cpp b/base/applications/mspaint/sizebox.cpp index 37a24cccec0..643f78fce1e 100644 --- a/base/applications/mspaint/sizebox.cpp +++ b/base/applications/mspaint/sizebox.cpp @@ -79,21 +79,21 @@ BOOL getSizeBoxRect(LPRECT prc, HITTEST hit, LPCRECT prcBase) HITTEST getSizeBoxHitTest(POINT pt, LPCRECT prcBase) { - RECT rc; + CRect rc; if (!::PtInRect(prcBase, pt)) return HIT_NONE; rc = *prcBase; - ::InflateRect(&rc, -GRIP_SIZE, -GRIP_SIZE); - if (::PtInRect(&rc, pt)) + rc.InflateRect(-GRIP_SIZE, -GRIP_SIZE); + if (rc.PtInRect(pt)) return HIT_INNER; for (INT i = HIT_UPPER_LEFT; i <= HIT_LOWER_RIGHT; ++i) { HITTEST hit = (HITTEST)i; getSizeBoxRect(&rc, hit, prcBase); - if (::PtInRect(&rc, pt)) + if (rc.PtInRect(pt)) return hit; } @@ -110,7 +110,7 @@ VOID drawSizeBoxes(HDC hdc, LPCRECT prcBase, BOOL bDrawFrame, LPCRECT prcPaint) if (bDrawFrame) { rc = *prcBase; - ::InflateRect(&rc, -GRIP_SIZE / 2, -GRIP_SIZE / 2); + rc.InflateRect(-GRIP_SIZE / 2, -GRIP_SIZE / 2); LOGBRUSH logBrush = { BS_HOLLOW, 0, 0 }; COLORREF rgbHighlight = ::GetSysColor(COLOR_HIGHLIGHT); diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 981b32687d1..2acc48e1bc9 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -52,7 +52,7 @@ void CTextEditWindow::FixEditPos(LPCWSTR pszOldText) RECT rcParent; ::GetWindowRect(m_hwndParent, &rcParent); - RECT rc, rcWnd, rcText; + CRect rc, rcWnd, rcText; GetWindowRect(&rcWnd); rcText = rcWnd; @@ -76,7 +76,7 @@ void CTextEditWindow::FixEditPos(LPCWSTR pszOldText) rcWnd = rc; ::GetClientRect(m_hwndParent, &rcParent); - IntersectRect(&rc, &rcParent, &rcWnd); + rc.IntersectRect(&rcParent, &rcWnd); MoveWindow(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, FALSE); @@ -158,13 +158,13 @@ LRESULT CTextEditWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& LRESULT CTextEditWindow::OnNCPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - RECT rc; + CRect rc; GetWindowRect(&rc); HDC hDC = GetDCEx(NULL, DCX_WINDOW | DCX_PARENTCLIP); if (hDC) { - OffsetRect(&rc, -rc.left, -rc.top); + rc.OffsetRect(-rc.left, -rc.top); DrawGrip(hDC, rc); ReleaseDC(hDC); } diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index d1a501728a2..589e7e4c222 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -169,8 +169,8 @@ VOID CToolSettingsWindow::drawLine(HDC hdc, LPCRECT prc) for (INT i = 0; i < 5; i++) { INT penWidth = i + 1; - RECT rcLine = rects[i]; - ::InflateRect(&rcLine, -2, 0); + CRect rcLine = rects[i]; + rcLine.InflateRect(-2, 0); rcLine.top = (rcLine.top + rcLine.bottom - penWidth) / 2; rcLine.bottom = rcLine.top + penWidth; if (toolsModel.GetLineWidth() == penWidth) @@ -242,17 +242,17 @@ static inline INT getBoxRects(RECT rects[3], LPCRECT prc, LPPOINT ppt = NULL) VOID CToolSettingsWindow::drawBox(HDC hdc, LPCRECT prc) { - RECT rects[3]; + CRect rects[3]; getBoxRects(rects, prc); for (INT iItem = 0; iItem < 3; ++iItem) { - RECT& rcItem = rects[iItem]; + CRect& rcItem = rects[iItem]; if (toolsModel.GetShapeStyle() == iItem) ::FillRect(hdc, &rcItem, ::GetSysColorBrush(COLOR_HIGHLIGHT)); - ::InflateRect(&rcItem, -5, -5); + rcItem.InflateRect(-5, -5); if (iItem <= 1) { @@ -289,9 +289,9 @@ LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, B m_hTranspIcon = (HICON)LoadImageW(g_hinstExe, MAKEINTRESOURCEW(IDI_TRANSPARENT), IMAGE_ICON, CX_TRANS_ICON, CY_TRANS_ICON, LR_DEFAULTCOLOR); - RECT trackbarZoomPos, rect2; + CRect trackbarZoomPos, rect2; calculateTwoBoxes(trackbarZoomPos, rect2); - ::InflateRect(&trackbarZoomPos, -1, -1); + trackbarZoomPos.InflateRect(-1, -1); trackbarZoom.Create(TRACKBAR_CLASS, m_hWnd, trackbarZoomPos, NULL, WS_CHILD | TBS_VERT | TBS_AUTOTICKS); trackbarZoom.SendMessage(TBM_SETRANGE, TRUE, MAKELPARAM(MIN_ZOOM_TRACK, MAX_ZOOM_TRACK)); @@ -336,23 +336,23 @@ LRESULT CToolSettingsWindow::OnNotify(UINT nMsg, WPARAM wParam, LPARAM lParam, B return 0; } -VOID CToolSettingsWindow::calculateTwoBoxes(RECT& rect1, RECT& rect2) +VOID CToolSettingsWindow::calculateTwoBoxes(CRect& rect1, CRect& rect2) { - RECT rcClient; + CRect rcClient; GetClientRect(&rcClient); - ::InflateRect(&rcClient, -MARGIN1, -MARGIN1); + rcClient.InflateRect(-MARGIN1, -MARGIN1); INT yCenter = (rcClient.top + rcClient.bottom) / 2; - ::SetRect(&rect1, rcClient.left, rcClient.top, rcClient.right, yCenter); - ::SetRect(&rect2, rcClient.left, yCenter, rcClient.right, rcClient.bottom); + rect1.SetRect(rcClient.left, rcClient.top, rcClient.right, yCenter); + rect2.SetRect(rcClient.left, yCenter, rcClient.right, rcClient.bottom); - ::InflateRect(&rect1, -MARGIN2, -MARGIN2); - ::InflateRect(&rect2, -MARGIN2, -MARGIN2); + rect1.InflateRect(-MARGIN2, -MARGIN2); + rect2.InflateRect(-MARGIN2, -MARGIN2); } LRESULT CToolSettingsWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - RECT rect1, rect2; + CRect rect1, rect2; calculateTwoBoxes(rect1, rect2); PAINTSTRUCT ps; @@ -364,8 +364,8 @@ LRESULT CToolSettingsWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BO if (toolsModel.GetActiveTool() >= TOOL_RECT) ::DrawEdge(hdc, &rect2, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE); - ::InflateRect(&rect1, -MARGIN2, -MARGIN2); - ::InflateRect(&rect2, -MARGIN2, -MARGIN2); + rect1.InflateRect(-MARGIN2, -MARGIN2); + rect2.InflateRect(-MARGIN2, -MARGIN2); switch (toolsModel.GetActiveTool()) { case TOOL_FREESEL: @@ -407,7 +407,7 @@ LRESULT CToolSettingsWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lPar { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - RECT rect1, rect2; + CRect rect1, rect2; calculateTwoBoxes(rect1, rect2); RECT rects[12]; diff --git a/base/applications/mspaint/toolsettings.h b/base/applications/mspaint/toolsettings.h index 7155d87ae6b..5d414130f2b 100644 --- a/base/applications/mspaint/toolsettings.h +++ b/base/applications/mspaint/toolsettings.h @@ -37,7 +37,7 @@ private: VOID drawLine(HDC hdc, LPCRECT prc); VOID drawBox(HDC hdc, LPCRECT prc); VOID drawAirBrush(HDC hdc, LPCRECT prc); - VOID calculateTwoBoxes(RECT& rect1, RECT& rect2); + VOID calculateTwoBoxes(CRect& rect1, CRect& rect2); LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

1 year, 1 month

[reactos] 01/01: [MSPAINT] Add selectionModel.moveSelection and use it

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f935132fbe134b41079ef… commit f935132fbe134b41079ef529522496db088e56c1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 23 14:44:27 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 23 14:44:27 2023 +0900 [MSPAINT] Add selectionModel.moveSelection and use it Refactoring. CORE-19094 --- base/applications/mspaint/canvas.cpp | 10 ---------- base/applications/mspaint/canvas.h | 1 - base/applications/mspaint/selectionmodel.cpp | 10 ++++++++++ base/applications/mspaint/selectionmodel.h | 1 + base/applications/mspaint/winproc.cpp | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 4509fbceee4..8a010603305 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -770,16 +770,6 @@ VOID CCanvasWindow::EndSelectionDrag(POINT ptImage) Invalidate(FALSE); } -VOID CCanvasWindow::MoveSelection(INT xDelta, INT yDelta) -{ - if (!selectionModel.m_bShow) - return; - - selectionModel.TakeOff(); - ::OffsetRect(&selectionModel.m_rc, xDelta, yDelta); - Invalidate(FALSE); -} - LRESULT CCanvasWindow::OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { SetTextColor((HDC)wParam, paletteModel.GetFgColor()); diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 9c780028cb2..e59b37cc670 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -52,7 +52,6 @@ public: VOID CanvasToImage(POINT& pt); VOID CanvasToImage(RECT& rc); VOID GetImageRect(RECT& rc); - VOID MoveSelection(INT xDelta, INT yDelta); VOID getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget); VOID zoomTo(INT newZoom, LONG left = 0, LONG top = 0); diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 8e32d17030d..a1ab20626b8 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -551,6 +551,16 @@ void SelectionModel::drawFrameOnCanvas(HDC hCanvasDC) drawSizeBoxes(hCanvasDC, &rcSelection, TRUE); } +void SelectionModel::moveSelection(INT xDelta, INT yDelta) +{ + if (!m_bShow) + return; + + TakeOff(); + ::OffsetRect(&m_rc, xDelta, yDelta); + canvasWindow.Invalidate(); +} + void SelectionModel::StretchSelection(BOOL bShrink) { if (!m_bShow) diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index f2d3a596823..37cf74ca38f 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -41,6 +41,7 @@ public: void DeleteSelection(); HITTEST hitTest(POINT ptCanvas); void drawFrameOnCanvas(HDC hCanvasDC); + void moveSelection(INT xDelta, INT yDelta); HBITMAP GetSelectionContents(); void DrawFramePoly(HDC hDCImage); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index a459dda4b76..0a280d95755 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -529,16 +529,16 @@ LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case VK_LEFT: - canvasWindow.MoveSelection(-1, 0); + selectionModel.moveSelection(-1, 0); break; case VK_RIGHT: - canvasWindow.MoveSelection(+1, 0); + selectionModel.moveSelection(+1, 0); break; case VK_UP: - canvasWindow.MoveSelection(0, -1); + selectionModel.moveSelection(0, -1); break; case VK_DOWN: - canvasWindow.MoveSelection(0, +1); + selectionModel.moveSelection(0, +1); break; default: break;

1 year, 1 month

[reactos] 01/01: [MSPAINT] Simplify CanvasToImage

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58c26d3fe6317e32b37cc… commit 58c26d3fe6317e32b37cc2ce49997f48b3f15da0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 23 14:22:40 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 23 14:22:40 2023 +0900 [MSPAINT] Simplify CanvasToImage Refactoring. CORE-19094 --- base/applications/mspaint/canvas.cpp | 13 ++++--------- base/applications/mspaint/canvas.h | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 99be275fd02..4509fbceee4 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -51,20 +51,16 @@ VOID CCanvasWindow::ImageToCanvas(RECT& rc) ::OffsetRect(&rc, GRIP_SIZE - GetScrollPos(SB_HORZ), GRIP_SIZE - GetScrollPos(SB_VERT)); } -VOID CCanvasWindow::CanvasToImage(POINT& pt, BOOL bZoomed) +VOID CCanvasWindow::CanvasToImage(POINT& pt) { pt.x -= GRIP_SIZE - GetScrollPos(SB_HORZ); pt.y -= GRIP_SIZE - GetScrollPos(SB_VERT); - if (bZoomed) - return; UnZoomed(pt); } -VOID CCanvasWindow::CanvasToImage(RECT& rc, BOOL bZoomed) +VOID CCanvasWindow::CanvasToImage(RECT& rc) { ::OffsetRect(&rc, GetScrollPos(SB_HORZ) - GRIP_SIZE, GetScrollPos(SB_VERT) - GRIP_SIZE); - if (bZoomed) - return; UnZoomed(rc); } @@ -367,12 +363,11 @@ LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO return 0; } - CanvasToImage(pt, TRUE); + CanvasToImage(pt); if (hit == HIT_INNER) { m_drawing = TRUE; - UnZoomed(pt); SetCapture(); toolsModel.OnButtonDown(bLeftButton, pt.x, pt.y, FALSE); Invalidate(FALSE); @@ -382,10 +377,10 @@ LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO if (bLeftButton) { m_hitCanvasSizeBox = hit; - UnZoomed(pt); m_ptOrig = pt; SetCapture(); } + return 0; } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index d65be1df606..9c780028cb2 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -49,8 +49,8 @@ public: VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(RECT& rc); - VOID CanvasToImage(POINT& pt, BOOL bZoomed = FALSE); - VOID CanvasToImage(RECT& rc, BOOL bZoomed = FALSE); + VOID CanvasToImage(POINT& pt); + VOID CanvasToImage(RECT& rc); VOID GetImageRect(RECT& rc); VOID MoveSelection(INT xDelta, INT yDelta); VOID getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget);

1 year, 1 month

[reactos] 01/01: [MSPAINT] Add selectionModel.drawFrameOnCanvas and use it

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a52a4b04ce5695b6e97d… commit 4a52a4b04ce5695b6e97dc4a38bb1440a3d5c8e7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 23 11:03:10 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 23 11:03:10 2023 +0900 [MSPAINT] Add selectionModel.drawFrameOnCanvas and use it Refactoring. CORE-19094 --- base/applications/mspaint/mouse.cpp | 16 ++-------------- base/applications/mspaint/selectionmodel.cpp | 15 +++++++++++++-- base/applications/mspaint/selectionmodel.h | 1 + base/applications/mspaint/toolsmodel.h | 3 --- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 9c268514b15..69a016b4395 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -103,18 +103,6 @@ void ToolBase::endEvent() m_hdc = NULL; } -void ToolBase::OnDrawSelectionOnCanvas(HDC hdc) -{ - if (!selectionModel.m_bShow) - return; - - RECT rcSelection = selectionModel.m_rc; - canvasWindow.ImageToCanvas(rcSelection); - - ::InflateRect(&rcSelection, GRIP_SIZE, GRIP_SIZE); - drawSizeBoxes(hdc, &rcSelection, TRUE); -} - void ToolBase::pushToPtStack(LONG x, LONG y) { if (s_pointSP >= s_maxPointSP) @@ -157,7 +145,7 @@ struct FreeSelTool : ToolBase void OnDrawOverlayOnCanvas(HDC hdc) override { - OnDrawSelectionOnCanvas(hdc); + selectionModel.drawFrameOnCanvas(hdc); } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override @@ -249,7 +237,7 @@ struct RectSelTool : ToolBase void OnDrawOverlayOnCanvas(HDC hdc) override { - OnDrawSelectionOnCanvas(hdc); + selectionModel.drawFrameOnCanvas(hdc); } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 1dda60404a4..8e32d17030d 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -523,8 +523,7 @@ void SelectionModel::NotifyContentChanged() void SelectionModel::SwapWidthAndHeight() { - INT cx = m_rc.Width(); - INT cy = m_rc.Height(); + INT cx = m_rc.Width(), cy = m_rc.Height(); m_rc.right = m_rc.left + cy; m_rc.bottom = m_rc.top + cx; } @@ -540,6 +539,18 @@ HITTEST SelectionModel::hitTest(POINT ptCanvas) return getSizeBoxHitTest(ptCanvas, &rcSelection); } +void SelectionModel::drawFrameOnCanvas(HDC hCanvasDC) +{ + if (!m_bShow) + return; + + RECT rcSelection = m_rc; + canvasWindow.ImageToCanvas(rcSelection); + + ::InflateRect(&rcSelection, GRIP_SIZE, GRIP_SIZE); + drawSizeBoxes(hCanvasDC, &rcSelection, TRUE); +} + void SelectionModel::StretchSelection(BOOL bShrink) { if (!m_bShow) diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 4fa9e3887dc..f2d3a596823 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -40,6 +40,7 @@ public: void HideSelection(); void DeleteSelection(); HITTEST hitTest(POINT ptCanvas); + void drawFrameOnCanvas(HDC hCanvasDC); HBITMAP GetSelectionContents(); void DrawFramePoly(HDC hDCImage); diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 81af5af3d98..903ac33f632 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -65,9 +65,6 @@ struct ToolBase void pushToPtStack(LONG x, LONG y); static ToolBase* createToolObject(TOOLTYPE type); - -protected: - void OnDrawSelectionOnCanvas(HDC hdc); }; class ToolsModel

1 year, 1 month

[reactos] 01/01: [MSPAINT] Add selectionModel.hitTest and use it

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2bb5aa01d5b66e8d7852… commit c2bb5aa01d5b66e8d7852c334e776433adac8f33 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 23 10:31:24 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 23 10:31:24 2023 +0900 [MSPAINT] Add selectionModel.hitTest and use it Refactoring. CORE-19094 --- base/applications/mspaint/canvas.cpp | 17 ++--------------- base/applications/mspaint/canvas.h | 1 - base/applications/mspaint/selectionmodel.cpp | 11 +++++++++++ base/applications/mspaint/selectionmodel.h | 1 + 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 99f1abf772b..99be275fd02 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -317,7 +317,7 @@ LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO return 0; } - HITTEST hitSelection = SelectionHitTest(pt); + HITTEST hitSelection = selectionModel.hitTest(pt); if (hitSelection != HIT_NONE) { selectionModel.m_nSelectionBrush = 0; // Selection Brush is OFF @@ -634,7 +634,7 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } - HITTEST hitSelection = SelectionHitTest(pt); + HITTEST hitSelection = selectionModel.hitTest(pt); if (hitSelection != HIT_NONE) { if (!setCursorOnSizeBox(hitSelection)) @@ -746,19 +746,6 @@ VOID CCanvasWindow::finishDrawing() Invalidate(FALSE); } -HITTEST CCanvasWindow::SelectionHitTest(POINT ptImage) -{ - if (!selectionModel.m_bShow) - return HIT_NONE; - - RECT rcSelection = selectionModel.m_rc; - Zoomed(rcSelection); - ::OffsetRect(&rcSelection, GRIP_SIZE - GetScrollPos(SB_HORZ), GRIP_SIZE - GetScrollPos(SB_VERT)); - ::InflateRect(&rcSelection, GRIP_SIZE, GRIP_SIZE); - - return getSizeBoxHitTest(ptImage, &rcSelection); -} - VOID CCanvasWindow::StartSelectionDrag(HITTEST hit, POINT ptImage) { m_hitSelection = hit; diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index e275e97a4d3..d65be1df606 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -68,7 +68,6 @@ protected: VOID DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint); VOID OnHVScroll(WPARAM wParam, INT fnBar); - HITTEST SelectionHitTest(POINT ptImage); VOID StartSelectionDrag(HITTEST hit, POINT ptImage); VOID SelectionDragging(POINT ptImage); VOID EndSelectionDrag(POINT ptImage); diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 3cf31aab9e0..1dda60404a4 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -529,6 +529,17 @@ void SelectionModel::SwapWidthAndHeight() m_rc.bottom = m_rc.top + cx; } +HITTEST SelectionModel::hitTest(POINT ptCanvas) +{ + if (!m_bShow) + return HIT_NONE; + + RECT rcSelection = m_rc; + canvasWindow.ImageToCanvas(rcSelection); + ::InflateRect(&rcSelection, GRIP_SIZE, GRIP_SIZE); + return getSizeBoxHitTest(ptCanvas, &rcSelection); +} + void SelectionModel::StretchSelection(BOOL bShrink) { if (!m_bShow) diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index e66b2bff0cc..4fa9e3887dc 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -39,6 +39,7 @@ public: BOOL IsLanded() const; void HideSelection(); void DeleteSelection(); + HITTEST hitTest(POINT ptCanvas); HBITMAP GetSelectionContents(); void DrawFramePoly(HDC hDCImage);

1 year, 1 month

[reactos] 01/01: [VGAFONTEDIT] Fix exception on New

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df54fb01fda9e7b24e897… commit df54fb01fda9e7b24e89786ce1d9abd5f6fc33eb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 23 08:34:56 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 23 08:34:56 2023 +0900 [VGAFONTEDIT] Fix exception on New Based on KRosUser's vgafont.patch. CORE-19192 --- modules/rosapps/applications/devutils/vgafontedit/fontwnd.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/rosapps/applications/devutils/vgafontedit/fontwnd.c b/modules/rosapps/applications/devutils/vgafontedit/fontwnd.c index fc865c25858..1d2bd8a3198 100644 --- a/modules/rosapps/applications/devutils/vgafontedit/fontwnd.c +++ b/modules/rosapps/applications/devutils/vgafontedit/fontwnd.c @@ -374,12 +374,17 @@ CreateFontWindow(IN PMAIN_WND_INFO MainWndInfo, IN PFONT_OPEN_INFO OpenInfo) if( InitFont(Info) ) { - PWSTR pszWindowTitle; + PWSTR pch, pszWindowTitle; if(OpenInfo->pszFileName) - pszWindowTitle = wcsrchr(OpenInfo->pszFileName, '\\') + 1; + { + pch = wcsrchr(OpenInfo->pszFileName, '\\'); + pszWindowTitle = (pch ? (pch + 1) : OpenInfo->pszFileName); + } else + { LoadAndFormatString(IDS_DOCNAME, &pszWindowTitle, ++MainWndInfo->uDocumentCounter); + } hFontWnd = CreateMDIWindowW( szFontWndClass, pszWindowTitle,

1 year, 1 month

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