Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 22:13:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSPAINT][ATL] Encapsulation: mainWindow (#5178)

Browse source 
- Add DoCreate methods to CFullscreenWindow, CMiniatureWindow, and CMainWindow classes.
- Do encapsulation around mainWindow and _tWinMain.
- Add GetOpenFileName, GetSaveFileName, and ChooseColor helper methods to CMainWindow class.
- Move some code in WinMain into CMainWindow::OnCreate.
- Delay creation of CFullscreenWindow and CMiniatureWindow.
- Extend ATL CImage class as CImageDx in newly-created atlimagedx.h of mspaint.
CORE-18867
This commit is contained in:
Katayama Hirofumi MZ 2023-03-28 22:31:26 +09:00 • committed by GitHub
parent 0569bbd4a7
commit 29e147beca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 549 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

16
base/applications/mspaint/palette.cpp
View file

@ -17,6 +17,8 @@
#define COLOR_COUNT 28
#define HALF_COLOR_COUNT (COLOR_COUNT / 2)
CPaletteWindow paletteWindow;
/* FUNCTIONS ********************************************************/
static VOID drawColorBox(HDC hDC, LPCRECT prc, COLORREF rgbColor, UINT nBorder)
@ -144,10 +146,11 @@ LRESULT CPaletteWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, B
LRESULT CPaletteWindow::OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
INT iColor = DoHitTest(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
if (iColor != -1 && ChooseColor(&choosecolor))
COLORREF rgbColor = paletteModel.GetFgColor();
if (iColor != -1 && mainWindow.ChooseColor(&rgbColor))
{
paletteModel.SetColor(iColor, choosecolor.rgbResult);
paletteModel.SetFgColor(choosecolor.rgbResult);
paletteModel.SetColor(iColor, rgbColor);
paletteModel.SetFgColor(rgbColor);
}
return 0;
}
@ -155,10 +158,11 @@ LRESULT CPaletteWindow::OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam,
LRESULT CPaletteWindow::OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
INT iColor = DoHitTest(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
if (iColor != -1 && ChooseColor(&choosecolor))
COLORREF rgbColor = paletteModel.GetBgColor();
if (iColor != -1 && mainWindow.ChooseColor(&rgbColor))
{
paletteModel.SetColor(iColor, choosecolor.rgbResult);
paletteModel.SetBgColor(choosecolor.rgbResult);
paletteModel.SetColor(iColor, rgbColor);
paletteModel.SetBgColor(rgbColor);
}
return 0;
}