Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[tfaber] 68374: [SHELL32_WINETEST] - Sync shfldr_special.c and shlview.c with Wine. Fixes some shell folder reference leaks. CORE-9867

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jul 7 13:44:32 2015 New Revision: 68374 URL: http://svn.reactos.org/svn/reactos?rev=68374&view=rev Log: [SHELL32_WINETEST] - Sync shfldr_special.c and shlview.c with Wine. Fixes some shell folder reference leaks. CORE-9867 Modified: trunk/rostests/winetests/shell32/shfldr_special.c trunk/rostests/winetests/shell32/shlview.c Modified: trunk/rostests/winetests/shell32/shfldr_special.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shfldr_… ============================================================================== --- trunk/rostests/winetests/shell32/shfldr_special.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shfldr_special.c [iso-8859-1] Tue Jul 7 13:44:32 2015 @@ -77,6 +77,7 @@ attr = ~0; hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, entire_network_path, &eaten, &pidl, &attr); + IShellFolder_Release(psfDesktop); if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || hr == HRESULT_FROM_WIN32(ERROR_NO_NET_OR_BAD_PATH) || hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) @@ -125,6 +126,7 @@ "Unexpected attributes : %08x\n", attr); ILFree(pidl); + IShellFolder_Release(psfDesktop); } static void test_printers_folder(void) @@ -222,9 +224,24 @@ CoUninitialize(); } +static void test_desktop_folder(void) +{ + IShellFolder *psf; + HRESULT hr; + + hr = SHGetDesktopFolder(&psf); + ok(hr == S_OK, "Got %x\n", hr); + + hr = IShellFolder_QueryInterface(psf, &IID_IShellFolder, NULL); + ok(hr == E_POINTER, "Got %x\n", hr); + + IShellFolder_Release(psf); +} + START_TEST(shfldr_special) { test_parse_for_entire_network(); test_parse_for_control_panel(); test_printers_folder(); -} + test_desktop_folder(); +} Modified: trunk/rostests/winetests/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlview… ============================================================================== --- trunk/rostests/winetests/shell32/shlview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlview.c [iso-8859-1] Tue Jul 7 13:44:32 2015 @@ -485,15 +485,156 @@ { 0 } }; -static void test_IShellView_CreateViewWindow(void) +static HRESULT WINAPI shellbrowser_QueryInterface(IShellBrowser *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualGUID(&IID_IShellBrowser, riid) || + IsEqualGUID(&IID_IOleWindow, riid) || + IsEqualGUID(&IID_IUnknown, riid)) + { + *ppv = iface; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI shellbrowser_AddRef(IShellBrowser *iface) +{ + return 2; +} + +static ULONG WINAPI shellbrowser_Release(IShellBrowser *iface) +{ + return 1; +} + +static HRESULT WINAPI shellbrowser_GetWindow(IShellBrowser *iface, HWND *phwnd) +{ + *phwnd = GetDesktopWindow(); + return S_OK; +} + +static HRESULT WINAPI shellbrowser_ContextSensitiveHelp(IShellBrowser *iface, BOOL mode) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_InsertMenusSB(IShellBrowser *iface, HMENU hmenuShared, + OLEMENUGROUPWIDTHS *menuwidths) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetMenuSB(IShellBrowser *iface, HMENU hmenuShared, + HOLEMENU holemenuReserved, HWND hwndActiveObject) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_RemoveMenusSB(IShellBrowser *iface, HMENU hmenuShared) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetStatusTextSB(IShellBrowser *iface, LPCOLESTR text) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_EnableModelessSB(IShellBrowser *iface, BOOL enable) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_TranslateAcceleratorSB(IShellBrowser *iface, MSG *pmsg, WORD wID) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_BrowseObject(IShellBrowser *iface, LPCITEMIDLIST pidl, UINT flags) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_GetViewStateStream(IShellBrowser *iface, DWORD mode, IStream **stream) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_GetControlWindow(IShellBrowser *iface, UINT id, HWND *phwnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SendControlMsg(IShellBrowser *iface, UINT id, UINT uMsg, + WPARAM wParam, LPARAM lParam, LRESULT *pret) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_QueryActiveShellView(IShellBrowser *iface, IShellView **view) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_OnViewWindowActive(IShellBrowser *iface, IShellView *view) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetToolbarItems(IShellBrowser *iface, LPTBBUTTONSB buttons, + UINT count, UINT flags) +{ + return E_NOTIMPL; +} + +static const IShellBrowserVtbl shellbrowservtbl = { + shellbrowser_QueryInterface, + shellbrowser_AddRef, + shellbrowser_Release, + shellbrowser_GetWindow, + shellbrowser_ContextSensitiveHelp, + shellbrowser_InsertMenusSB, + shellbrowser_SetMenuSB, + shellbrowser_RemoveMenusSB, + shellbrowser_SetStatusTextSB, + shellbrowser_EnableModelessSB, + shellbrowser_TranslateAcceleratorSB, + shellbrowser_BrowseObject, + shellbrowser_GetViewStateStream, + shellbrowser_GetControlWindow, + shellbrowser_SendControlMsg, + shellbrowser_QueryActiveShellView, + shellbrowser_OnViewWindowActive, + shellbrowser_SetToolbarItems +}; + +static IShellBrowser test_shellbrowser = { &shellbrowservtbl }; + +static void test_CreateViewWindow(void) { IShellFolder *desktop; + HWND hwnd_view, hwnd2; FOLDERSETTINGS settings; IShellView *view; IDropTarget *dt; - HWND hwnd_view; HRESULT hr; RECT r = {0}; + ULONG ref1, ref2; hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -519,6 +660,16 @@ ok(hr == E_UNEXPECTED, "got (0x%08x)\n", hr); ok(hwnd_view == 0, "got %p\n", hwnd_view); + hwnd_view = NULL; + hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd_view); + ok(hr == S_OK || broken(hr == S_FALSE), "got (0x%08x)\n", hr); + ok(hwnd_view != 0, "got %p\n", hwnd_view); + + hwnd2 = (HWND)0xdeadbeef; + hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd2); + ok(hr == E_UNEXPECTED, "got (0x%08x)\n", hr); + ok(hwnd2 == NULL, "got %p\n", hwnd2); + /* ::DragLeave without drag operation */ hr = IShellView_QueryInterface(view, &IID_IDropTarget, (void**)&dt); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -526,7 +677,29 @@ ok(hr == S_OK, "got (0x%08x)\n", hr); IDropTarget_Release(dt); - IShellView_Release(view); + IShellView_AddRef(view); + ref1 = IShellView_Release(view); + hr = IShellView_DestroyViewWindow(view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(!IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + ref2 = IShellView_Release(view); + ok(ref1 > ref2, "expected %u > %u\n", ref1, ref2); + ref1 = ref2; + + /* Show that releasing the shell view does not destroy the window */ + hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + hwnd_view = NULL; + hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd_view); + ok(hr == S_OK || broken(hr == S_FALSE), "got (0x%08x)\n", hr); + ok(hwnd_view != NULL, "got %p\n", hwnd_view); + ok(IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + ref2 = IShellView_Release(view); + ok(ref2 != 0, "ref2 = %u\n", ref2); + ok(ref2 > ref1, "expected %u > %u\n", ref2, ref1); + ok(IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + DestroyWindow(hwnd_view); + IShellFolder_Release(desktop); } @@ -536,13 +709,14 @@ FOLDERSETTINGS settings; IShellView *view; IShellBrowser *browser; + IFolderView2 *fv2; IFolderView *fv; + IUnknown *unk; HWND hwnd_view, hwnd_list; PITEMID_CHILD pidl; HRESULT hr; INT ret, count; POINT pt; - LONG ref1, ref2; RECT r; hr = SHGetDesktopFolder(&desktop); @@ -670,15 +844,23 @@ hr = IFolderView_GetFolder(fv, &IID_IShellFolder, NULL); ok(hr == E_POINTER, "got (0x%08x)\n", hr); - ref1 = IShellFolder_AddRef(desktop); - IShellFolder_Release(desktop); hr = IFolderView_GetFolder(fv, &IID_IShellFolder, (void**)&folder); ok(hr == S_OK, "got (0x%08x)\n", hr); - ref2 = IShellFolder_AddRef(desktop); - IShellFolder_Release(desktop); - ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ - "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); + if (folder) IShellFolder_Release(folder); + + hr = IFolderView_GetFolder(fv, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + if (unk) IUnknown_Release(unk); + + hr = IFolderView_QueryInterface(fv, &IID_IFolderView2, (void**)&fv2); + if (hr != S_OK) + win_skip("IFolderView2 is not supported.\n"); + if (fv2) IFolderView2_Release(fv2); + + hr = IShellView_DestroyViewWindow(view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(!IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); IShellBrowser_Release(browser); IFolderView_Release(fv); @@ -707,7 +889,7 @@ unk = NULL; hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IDispatch, (void**)&unk); - todo_wine ok(hr == S_OK || broken(hr == E_NOTIMPL) /* NT4 */, "got (0x%08x)\n", hr); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* NT4 */, "got (0x%08x)\n", hr); if (unk) IUnknown_Release(unk); unk = NULL; @@ -782,6 +964,7 @@ { IShellFolder *desktop; IShellView *view; + IOleWindow *wnd; HRESULT hr; hr = SHGetDesktopFolder(&desktop); @@ -789,6 +972,9 @@ hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellView_QueryInterface(view, &IID_IOleWindow, (void**)&wnd); + ok(hr == E_NOINTERFACE, "got (0x%08x)\n", hr); /* IShellView::ContextSensitiveHelp */ hr = IShellView_ContextSensitiveHelp(view, TRUE); @@ -1152,7 +1338,7 @@ init_msg_sequences(sequences, NUM_MSG_SEQUENCES); - test_IShellView_CreateViewWindow(); + test_CreateViewWindow(); test_IFolderView(); test_GetItemObject(); test_IShellFolderView();

9 years, 4 months

[gedmurphy] 68373: [DEVMGR] Start to fixup and merge the resources. English only at the moment

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jul 7 12:51:45 2015 New Revision: 68373 URL: http://svn.reactos.org/svn/reactos?rev=68373&view=rev Log: [DEVMGR] Start to fixup and merge the resources. English only at the moment Added: trunk/reactos/dll/win32/devmgr_new/api.c (with props) trunk/reactos/dll/win32/devmgr_new/resources/computer.ico - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/devmgmt/res/computer.ico trunk/reactos/dll/win32/devmgr_new/resources/root.bmp - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/devmgmt/res/root.bmp trunk/reactos/dll/win32/devmgr_new/resources/toolbar.bmp - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/devmgmt/res/toolbar.bmp Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc trunk/reactos/dll/win32/devmgr_new/devmgmt/res/computer.ico trunk/reactos/dll/win32/devmgr_new/devmgmt/res/root.bmp trunk/reactos/dll/win32/devmgr_new/devmgmt/res/toolbar.bmp trunk/reactos/dll/win32/devmgr_new/resources/devmgr.ico Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt trunk/reactos/dll/win32/devmgr_new/devmgr.rc trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc trunk/reactos/dll/win32/devmgr_new/properties/stubs.c trunk/reactos/dll/win32/devmgr_new/resource.h Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] Tue Jul 7 12:51:45 2015 @@ -1,18 +1,18 @@ spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB) -set_cpp(WITH_RTTI WITH_STL) +set_cpp(WITH_RTTI WITH_RUNTIME) include_directories(${REACTOS_SOURCE_DIR}/lib/atl) list(APPEND SOURCE precomp.h - Properties/advprop.c - Properties/devprblm.c - Properties/hwpage.c - Properties/hwresource.c - Properties/misc.c - Properties/stubs.c + properties/advprop.c + properties/devprblm.c + properties/hwpage.c + properties/hwresource.c + properties/misc.c + properties/stubs.c devmgmt/ClassNode.cpp devmgmt/DeviceNode.cpp devmgmt/DeviceView.cpp Added: trunk/reactos/dll/win32/devmgr_new/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/api.c… ============================================================================== (empty) Propchange: trunk/reactos/dll/win32/devmgr_new/api.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc (removed) @@ -1,98 +0,0 @@ -/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ - -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT - -IDR_MAINMENU MENU -BEGIN - POPUP "&KÃ¼tÃ¼k" - BEGIN - MENUITEM "&ÃÄ±kÄ±Å", IDC_EXIT - END - POPUP "&Eylem" - BEGIN - MENUITEM "&SÃ¼rÃ¼cÃ¼ YazÄ±lmÄ±nÄ± ÅimdikileÅtir..." IDC_UPDATE_DRV - MENUITEM "&EtkinleÅtir" IDC_ENABLE_DRV - MENUITEM "E&dilginleÅtir" IDC_DISABLE_DRV - MENUITEM "&KaldÄ±r" IDC_UNINSTALL_DRV - MENUITEM SEPARATOR - MENUITEM "D&onanÄ±m DeÄiÅiklikleri Ä°Ã§in Tara" IDC_SCAN_HARDWARE - MENUITEM "Do&nanÄ±m Ekle" IDC_ADD_HARDWARE, GRAYED - MENUITEM SEPARATOR - MENUITEM "&HusÃ»siyetler", IDC_PROPERTIES - END - POPUP "&GÃ¶rÃ¼nÃ¼m" - BEGIN - MENUITEM "&TÃ¼re GÃ¶re AygÄ±tlar", IDC_DEVBYTYPE - MENUITEM "&BaÄlantÄ±ya GÃ¶re AygÄ±tlar", IDC_DEVBYCONN - MENUITEM "T&Ã¼re GÃ¶re Kaynaklar", IDC_RESBYTYPE, GRAYED - MENUITEM "B&aÄlantÄ±ya GÃ¶re Kaynaklar", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Gizli AygÄ±tlarÄ± GÃ¶ster", IDC_SHOWHIDDEN - END - POPUP "&YardÄ±m" - BEGIN - MENUITEM "&Ãzerine", IDC_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "&SÃ¼rÃ¼cÃ¼ YazÄ±lmÄ±nÄ± ÅimdikileÅtir..." IDC_UPDATE_DRV - MENUITEM "&EtkinleÅtir" IDC_ENABLE_DRV - MENUITEM "E&dilginleÅtir" IDC_DISABLE_DRV - MENUITEM "&KaldÄ±r" IDC_UNINSTALL_DRV - MENUITEM SEPARATOR - MENUITEM "D&onanÄ±m DeÄiÅiklikleri Ä°Ã§in Tara" IDC_SCAN_HARDWARE - MENUITEM "Do&nanÄ±m Ekle" IDC_ADD_HARDWARE, GRAYED - MENUITEM SEPARATOR - MENUITEM "&HusÃ»siyetler", IDC_PROPERTIES - END -END - -#define IDS_HINT_PROPERTIES 20001 -#define IDS_HINT_SCAN 20002 -#define IDS_HINT_ENABLE 20003 -#define IDS_HINT_DISABLE 20004 -#define IDS_HINT_UPDATE 20005 -#define IDS_HINT_UNINSTALL 20006 - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROPERTIES "HusÃ»siyetler" - IDS_TOOLTIP_SCAN "DonanÄ±m DeÄiÅiklikleri Ä°Ã§in Tara" - IDS_TOOLTIP_ENABLE "EtkinleÅtir" - IDS_TOOLTIP_DISABLE "EdilginleÅtir" - IDS_TOOLTIP_UPDATE "SÃ¼rÃ¼cÃ¼ YazÄ±lmÄ±nÄ± ÅimdikileÅtir" - IDS_TOOLTIP_UNINSTALL "KaldÄ±r" -END - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "AygÄ±t YÃ¶neticisi" - IDS_HINT_BLANK " " - IDS_HINT_PROPERTIES " Åimdiki seÃ§ilen iÃ§in husÃ»siyet penceresini aÃ§ar." - IDS_HINT_SCAN " Yeni ya da deÄiÅtirilmiÅ tak ve Ã§alÄ±ÅtÄ±r aygÄ±tlarÄ± iÃ§in tarar." - IDS_HINT_ENABLE " SeÃ§ili aygÄ±tÄ± etkinleÅtirir." - IDS_HINT_DISABLE " SeÃ§ili aygÄ±tÄ± edilginleÅtirir." - IDS_HINT_UPDATE " SeÃ§ili aygÄ±t iÃ§in SÃ¼rÃ¼cÃ¼ YazÄ±lÄ±mÄ±nÄ± ÅimdikileÅtir yardÄ±mcÄ±sÄ±nÄ± baÅlatÄ±r." - IDS_HINT_UNINSTALL " SeÃ§ili aygÄ±t iÃ§in sÃ¼rÃ¼cÃ¼yÃ¼ kaldÄ±rÄ±r." - IDS_HINT_ADD " Bilgisayara eski (Tak ve ÃalÄ±ÅtÄ±r olmayan) bir aygÄ±t ekler." - IDS_HINT_ABOUT " AygÄ±t YÃ¶neticisi Ã¼zerine." - IDS_HINT_EXIT " Ä°zlenceden Ã§Ä±kar." - - IDS_HINT_DEV_BY_TYPE " DonanÄ±m tÃ¼rÃ¼ne gÃ¶re aygÄ±tlarÄ± gÃ¶rÃ¼ntÃ¼ler." - IDS_HINT_DEV_BY_CONN " BaÄlantÄ±ya gÃ¶re aygÄ±tlarÄ± gÃ¶rÃ¼ntÃ¼ler." - IDS_HINT_RES_BY_TYPE " TÃ¼re gÃ¶re kaynaklarÄ± gÃ¶rÃ¼ntÃ¼ler." - IDS_HINT_RES_BY_CONN " BaÄlantÄ± tÃ¼rÃ¼ne gÃ¶re kaynaklarÄ± gÃ¶rÃ¼ntÃ¼ler." - IDS_HINT_SHOW_HIDDEN " Eski aygÄ±tlarÄ± ve artÄ±k kurulu olmayacak aygÄ±tlarÄ± gÃ¶rÃ¼ntÃ¼ler." - - IDS_HINT_SYS_RESTORE " Bu pencereyi dÃ¼zgÃ¼lÃ¼k boyutlarÄ±na dÃ¶ndÃ¼rÃ¼r." - IDS_HINT_SYS_MOVE " Bu pencereyi devindirir." - IDS_HINT_SYS_SIZE " Bu pencereyi yeniden boyutlandÄ±rÄ±r." - IDS_HINT_SYS_MINIMIZE " Bu pencereyi bir simgeye kÃ¼Ã§Ã¼ltÃ¼r." - IDS_HINT_SYS_MAXIMIZE " Bu pencereyi, bu gÃ¶rÃ¼ntÃ¼lÃ¼ÄÃ¼ kaplatana dek geniÅletir." - IDS_HINT_SYS_CLOSE " Bu pencereyi kapatÄ±r." -END Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/res/computer.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/res/root.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/res/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/dll/win32/devmgr_new/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgr.rc [iso-8859-1] Tue Jul 7 12:51:45 2015 @@ -12,9 +12,15 @@ #define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll" #include <reactos/version.rc> -IDI_DEVMGR ICON "resources/devmgr.ico" +IDI_MAIN_ICON ICON "resources/computer.ico" +IDB_ROOT_IMAGE BITMAP "resources/root.bmp" + +/* main toolbar icons */ +IDB_TOOLBAR BITMAP DISCARDABLE "resources/toolbar.bmp" #include <reactos/manifest_dll.rc> + +#define LANGUAGE_EN_US /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/lang/… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc [iso-8859-1] Tue Jul 7 12:51:45 2015 @@ -235,3 +235,85 @@ ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END + + +/* + This code relates to the device manager GUI + */ + +IDR_MAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + MENUITEM "Action" IDC_ACTIONMENU + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" +END +STRINGTABLE DISCARDABLE +BEGIN + IDS_MENU_UPDATE "Update driver software..." + IDS_MENU_ENABLE "Enable" + IDS_MENU_DISABLE "Disable" + IDS_MENU_UNINSTALL "Uninstall" + IDS_MENU_SCAN "Scan for hardware changes" + IDS_MENU_ADD "Add hardware" + IDS_MENU_PROPERTIES "Properties" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROPERTIES "Properties" + IDS_TOOLTIP_SCAN "Scan for hardware changes" + IDS_TOOLTIP_ENABLE "Enable" + IDS_TOOLTIP_DISABLE "Disable" + IDS_TOOLTIP_UPDATE "Update Driver Software" + IDS_TOOLTIP_UNINSTALL "Uninstall" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Device Manager" + IDS_HINT_BLANK " " + IDS_HINT_PROPERTIES " Open property dialog for the current selection." + IDS_HINT_SCAN " Scan for changed or new plug and play devices." + IDS_HINT_ENABLE " Enables the selected device." + IDS_HINT_DISABLE " Disables the selected device." + IDS_HINT_UPDATE " Launches the Update Driver Software wizard for the selected device." + IDS_HINT_UNINSTALL " Uninstalls the driver for the selected device." + IDS_HINT_ADD " Adds a legacy (non-Plug and Play) device to the computer." + IDS_HINT_ABOUT " About ReactOS Device Manager." + IDS_HINT_EXIT " Exits the program." + + IDS_HINT_DEV_BY_TYPE " Displays devices by hardware type." + IDS_HINT_DEV_BY_CONN " Displays devices by connection." + IDS_HINT_RES_BY_TYPE " Displays resources by type." + IDS_HINT_RES_BY_CONN " Displays resources by connection type." + IDS_HINT_SHOW_HIDDEN " Displays legacy devices and devices that are no longer installed." + + IDS_HINT_SYS_RESTORE " Restores this window to normal size." + IDS_HINT_SYS_MOVE " Moves this window." + IDS_HINT_SYS_SIZE " Resizes this window." + IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." + IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." + IDS_HINT_SYS_CLOSE " Closes this window." +END Modified: trunk/reactos/dll/win32/devmgr_new/properties/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/stubs.c [iso-8859-1] Tue Jul 7 12:51:45 2015 @@ -81,16 +81,16 @@ * * @unimplemented */ -BOOL -WINAPI -DeviceManager_ExecuteW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpMachineName, - int nCmdShow) -{ - UNIMPLEMENTED; - return FALSE; -} +//BOOL +//WINAPI +//DeviceManager_ExecuteW(HWND hWndParent, +// HINSTANCE hInst, +// LPCWSTR lpMachineName, +// int nCmdShow) +//{ +// UNIMPLEMENTED; +// return FALSE; +//} /*************************************************************************** Modified: trunk/reactos/dll/win32/devmgr_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/resou… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/resource.h [iso-8859-1] Tue Jul 7 12:51:45 2015 @@ -1,46 +1,98 @@ #pragma once -#define IDI_DEVMGR 100 - -#define IDD_HARDWARE 100 -#define IDD_DEVICEGENERAL 101 -#define IDD_DEVICEDRIVER 102 -#define IDD_DEVICERESOURCES 103 -#define IDD_DRIVERDETAILS 104 -#define IDD_DEVICEDETAILS 105 -#define IDD_DEVICEPOWER 106 - -#define IDC_DEVICON 0x57B -#define IDC_DEVNAME 0x57C -#define IDC_DEVTYPE 0x57D -#define IDC_DEVMANUFACTURER 0x57E -#define IDC_DEVLOCATION 0x57F -#define IDC_DEVSTATUSGROUP 0x580 -#define IDC_DEVSTATUS 0x581 -#define IDC_DEVUSAGE 0x582 -#define IDC_DEVICES 0x583 -#define IDC_LV_DEVICES 0x584 -#define IDC_PROPERTIESGROUP 0x585 -#define IDC_MANUFACTURER 0x587 -#define IDC_LOCATION 0x588 -#define IDC_STATUS 0x586 -#define IDC_TROUBLESHOOT 0x589 -#define IDC_PROPERTIES 0x58A -#define IDC_DEVUSAGELABEL 0x58B -#define IDC_DEVPROBLEM 0x58C -#define IDC_DRVPROVIDER 0x58D -#define IDC_DRVDATE 0x58E -#define IDC_DRVVERSION 0x58F -#define IDC_DIGITALSIGNER 0x590 -#define IDC_DRIVERDETAILS 0x591 -#define IDC_DRIVERFILES 0x592 -#define IDC_FILEPROVIDER 0x593 -#define IDC_FILEVERSION 0x594 -#define IDC_FILECOPYRIGHT 0x595 -#define IDC_DETAILSPROPNAME 0x596 -#define IDC_DETAILSPROPVALUE 0x597 -#define IDC_UPDATEDRIVER 0x598 -#define IDC_DRIVERRESOURCES 0x599 +#define IDC_STATIC -1 + +#define IDS_APPNAME 10 + +#define IDI_MAIN_ICON 20 +#define IDB_ROOT_IMAGE 21 +#define IDB_TOOLBAR 22 + +/* windows */ +#define IDC_TREEVIEW 30 +#define IDC_TOOLBAR 31 +#define IDC_STATUSBAR 32 +#define IDR_MAINMENU 33 +#define IDR_POPUP 34 + +/* Actions */ +#define IDC_PROPERTIES 40 +#define IDC_SCAN_HARDWARE 41 +#define IDC_ENABLE_DRV 42 +#define IDC_DISABLE_DRV 43 +#define IDC_UPDATE_DRV 44 +#define IDC_UNINSTALL_DRV 45 +#define IDC_ADD_HARDWARE 46 + +/* Menu items */ +#define IDC_ACTIONMENU 50 +#define IDC_ABOUT 51 +#define IDC_EXIT 52 + + +/* view menu */ +#define IDC_DEVBYTYPE 60 +#define IDC_DEVBYCONN 61 +#define IDC_RESBYTYPE 62 +#define IDC_RESBYCONN 63 +#define IDC_SHOWHIDDEN 64 + + +/* tooltips */ +#define IDS_TOOLTIP_PROPERTIES 70 +#define IDS_TOOLTIP_SCAN 71 +#define IDS_TOOLTIP_ENABLE 72 +#define IDS_TOOLTIP_DISABLE 73 +#define IDS_TOOLTIP_UPDATE 74 +#define IDS_TOOLTIP_UNINSTALL 75 + +/* General strings */ +#define IDS_CONFIRM_DISABLE 80 + +/* Menu strings */ +#define IDS_MENU_UPDATE 90 +#define IDS_MENU_ENABLE 91 +#define IDS_MENU_DISABLE 92 +#define IDS_MENU_UNINSTALL 93 +#define IDS_MENU_SCAN 94 +#define IDS_MENU_ADD 95 +#define IDS_MENU_PROPERTIES 96 + + +/* menu hints */ +#define IDS_HINT_BLANK 100 +#define IDS_HINT_PROPERTIES 101 +#define IDS_HINT_SCAN 102 +#define IDS_HINT_ENABLE 103 +#define IDS_HINT_DISABLE 104 +#define IDS_HINT_UPDATE 105 +#define IDS_HINT_UNINSTALL 106 +#define IDS_HINT_ADD 107 +#define IDS_HINT_ABOUT 108 +#define IDS_HINT_EXIT 109 + +#define IDS_HINT_DEV_BY_TYPE 120 +#define IDS_HINT_DEV_BY_CONN 121 +#define IDS_HINT_RES_BY_TYPE 123 +#define IDS_HINT_RES_BY_CONN 124 +#define IDS_HINT_SHOW_HIDDEN 125 + +/* system menu hints */ +#define IDS_HINT_SYS_RESTORE 130 +#define IDS_HINT_SYS_MOVE 131 +#define IDS_HINT_SYS_SIZE 132 +#define IDS_HINT_SYS_MINIMIZE 133 +#define IDS_HINT_SYS_MAXIMIZE 134 +#define IDS_HINT_SYS_CLOSE 135 + + + + + + + + +#define IDI_DEVMGR 255 #define IDS_NAME 0x100 #define IDS_TYPE 0x101 @@ -154,3 +206,43 @@ #define IDS_PROP_CURRENTPOWERSTATE 0x315 #define IDS_PROP_POWERCAPABILITIES 0x316 #define IDS_PROP_POWERSTATEMAPPINGS 0x317 + +#define IDD_HARDWARE 0x400 +#define IDD_DEVICEGENERAL 0x401 +#define IDD_DEVICEDRIVER 0x402 +#define IDD_DEVICERESOURCES 0x403 +#define IDD_DRIVERDETAILS 0x404 +#define IDD_DEVICEDETAILS 0x405 +#define IDD_DEVICEPOWER 0x406 + +#define IDC_DEVICON 0x57B +#define IDC_DEVNAME 0x57C +#define IDC_DEVTYPE 0x57D +#define IDC_DEVMANUFACTURER 0x57E +#define IDC_DEVLOCATION 0x57F +#define IDC_DEVSTATUSGROUP 0x580 +#define IDC_DEVSTATUS 0x581 +#define IDC_DEVUSAGE 0x582 +#define IDC_DEVICES 0x583 +#define IDC_LV_DEVICES 0x584 +#define IDC_PROPERTIESGROUP 0x585 +#define IDC_MANUFACTURER 0x587 +#define IDC_LOCATION 0x588 +#define IDC_STATUS 0x586 +#define IDC_TROUBLESHOOT 0x589 +#define IDC_PROPERTIES2 0x58A +#define IDC_DEVUSAGELABEL 0x58B +#define IDC_DEVPROBLEM 0x58C +#define IDC_DRVPROVIDER 0x58D +#define IDC_DRVDATE 0x58E +#define IDC_DRVVERSION 0x58F +#define IDC_DIGITALSIGNER 0x590 +#define IDC_DRIVERDETAILS 0x591 +#define IDC_DRIVERFILES 0x592 +#define IDC_FILEPROVIDER 0x593 +#define IDC_FILEVERSION 0x594 +#define IDC_FILECOPYRIGHT 0x595 +#define IDC_DETAILSPROPNAME 0x596 +#define IDC_DETAILSPROPVALUE 0x597 +#define IDC_UPDATEDRIVER 0x598 +#define IDC_DRIVERRESOURCES 0x599 Removed: trunk/reactos/dll/win32/devmgr_new/resources/devmgr.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/resou… ============================================================================== Binary file - no diff available.

9 years, 4 months

[bfreisen] 68372: [MSPAINT_NEW] turn the history into an ImageModel

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Tue Jul 7 11:56:37 2015 New Revision: 68372 URL: http://svn.reactos.org/svn/reactos?rev=68372&view=rev Log: [MSPAINT_NEW] turn the history into an ImageModel Modified: trunk/reactos/base/applications/mspaint_new/definitions.h trunk/reactos/base/applications/mspaint_new/dialogs.cpp trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/history.cpp trunk/reactos/base/applications/mspaint_new/history.h trunk/reactos/base/applications/mspaint_new/imgarea.cpp trunk/reactos/base/applications/mspaint_new/imgarea.h trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/miniature.cpp trunk/reactos/base/applications/mspaint_new/mouse.cpp trunk/reactos/base/applications/mspaint_new/scrollbox.cpp trunk/reactos/base/applications/mspaint_new/selection.cpp trunk/reactos/base/applications/mspaint_new/sizebox.cpp trunk/reactos/base/applications/mspaint_new/winproc.cpp Modified: trunk/reactos/base/applications/mspaint_new/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/definitions.h [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -226,3 +226,5 @@ #define WM_TOOLSMODELZOOMCHANGED (WM_APP + 2) #define WM_PALETTEMODELCOLORCHANGED (WM_APP + 3) #define WM_PALETTEMODELPALETTECHANGED (WM_APP + 4) +#define WM_IMAGEMODELDIMENSIONSCHANGED (WM_APP + 5) +#define WM_IMAGEMODELIMAGECHANGED (WM_APP + 6) Modified: trunk/reactos/base/applications/mspaint_new/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/dialogs.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -79,8 +79,8 @@ TCHAR strrc[100]; TCHAR res[100]; - widthSetInDlg = imgXRes; - heightSetInDlg = imgYRes; + widthSetInDlg = imageModel.GetWidth(); + heightSetInDlg = imageModel.GetHeight(); CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); @@ -119,8 +119,8 @@ EndDialog(hwnd, 0); break; case IDD_ATTRIBUTESSTANDARD: - widthSetInDlg = imgXRes; - heightSetInDlg = imgYRes; + widthSetInDlg = imageModel.GetWidth(); + heightSetInDlg = imageModel.GetHeight(); CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, widthSetInDlg, FALSE); Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -24,19 +24,14 @@ extern HDC hSelDC; extern int *bmAddress; extern BITMAPINFO bitmapinfo; -extern int imgXRes; -extern int imgYRes; extern int widthSetInDlg; extern int heightSetInDlg; extern STRETCHSKEW stretchSkew; -extern HBITMAP hBms[HISTORYSIZE]; -extern int currInd; -extern int undoSteps; -extern int redoSteps; -extern BOOL imageSaved; +class ImageModel; +extern ImageModel imageModel; extern POINT start; extern POINT last; Modified: trunk/reactos/base/applications/mspaint_new/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -12,21 +12,17 @@ /* FUNCTIONS ********************************************************/ -extern void updateCanvasAndScrollbars(void); - -void -setImgXYRes(int x, int y) +void ImageModel::NotifyDimensionsChanged() { - if ((imgXRes != x) || (imgYRes != y)) - { - imgXRes = x; - imgYRes = y; - updateCanvasAndScrollbars(); - } + imageArea.SendMessage(WM_IMAGEMODELDIMENSIONSCHANGED); } -void -newReversible() +void ImageModel::NotifyImageChanged() +{ + imageArea.SendMessage(WM_IMAGEMODELIMAGECHANGED); +} + +void ImageModel::CopyPrevious() { DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); hBms[(currInd + 1) % HISTORYSIZE] = (HBITMAP) CopyImage(hBms[currInd], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG); @@ -35,62 +31,64 @@ undoSteps++; redoSteps = 0; SelectObject(hDrawingDC, hBms[currInd]); - imgXRes = GetDIBWidth(hBms[currInd]); - imgYRes = GetDIBHeight(hBms[currInd]); imageSaved = FALSE; } -void -undo() +void ImageModel::Undo() { if (undoSteps > 0) { + int oldWidth = GetWidth(); + int oldHeight = GetHeight(); selectionWindow.ShowWindow(SW_HIDE); currInd = (currInd + HISTORYSIZE - 1) % HISTORYSIZE; SelectObject(hDrawingDC, hBms[currInd]); undoSteps--; if (redoSteps < HISTORYSIZE - 1) redoSteps++; - setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); + if (GetWidth() != oldWidth || GetHeight() != oldHeight) + NotifyDimensionsChanged(); + NotifyImageChanged(); } } -void -redo() +void ImageModel::Redo() { if (redoSteps > 0) { + int oldWidth = GetWidth(); + int oldHeight = GetHeight(); selectionWindow.ShowWindow(SW_HIDE); currInd = (currInd + 1) % HISTORYSIZE; SelectObject(hDrawingDC, hBms[currInd]); redoSteps--; if (undoSteps < HISTORYSIZE - 1) undoSteps++; - setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); + if (GetWidth() != oldWidth || GetHeight() != oldHeight) + NotifyDimensionsChanged(); + NotifyImageChanged(); } } -void -resetToU1() +void ImageModel::ResetToPrevious() { DeleteObject(hBms[currInd]); hBms[currInd] = (HBITMAP) CopyImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG); SelectObject(hDrawingDC, hBms[currInd]); - imgXRes = GetDIBWidth(hBms[currInd]); - imgYRes = GetDIBHeight(hBms[currInd]); + NotifyImageChanged(); } -void -clearHistory() +void ImageModel::ClearHistory() { undoSteps = 0; redoSteps = 0; } -void -insertReversible(HBITMAP hbm) +void ImageModel::Insert(HBITMAP hbm) { + int oldWidth = GetWidth(); + int oldHeight = GetHeight(); DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); hBms[(currInd + 1) % HISTORYSIZE] = hbm; currInd = (currInd + 1) % HISTORYSIZE; @@ -98,19 +96,22 @@ undoSteps++; redoSteps = 0; SelectObject(hDrawingDC, hBms[currInd]); - setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); + if (GetWidth() != oldWidth || GetHeight() != oldHeight) + NotifyDimensionsChanged(); + NotifyImageChanged(); } -void -cropReversible(int width, int height, int xOffset, int yOffset) +void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY) { HDC hdc; HPEN oldPen; HBRUSH oldBrush; + int oldWidth = GetWidth(); + int oldHeight = GetHeight(); SelectObject(hDrawingDC, hBms[currInd]); DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); - hBms[(currInd + 1) % HISTORYSIZE] = CreateDIBWithProperties(width, height); + hBms[(currInd + 1) % HISTORYSIZE] = CreateDIBWithProperties(nWidth, nHeight); currInd = (currInd + 1) % HISTORYSIZE; if (undoSteps < HISTORYSIZE - 1) undoSteps++; @@ -121,12 +122,71 @@ oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, paletteModel.GetBgColor())); oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(paletteModel.GetBgColor())); - Rectangle(hdc, 0, 0, width, height); - BitBlt(hdc, -xOffset, -yOffset, imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); + Rectangle(hdc, 0, 0, nWidth, nHeight); + BitBlt(hdc, -nOffsetX, -nOffsetY, GetWidth(), GetHeight(), hDrawingDC, 0, 0, SRCCOPY); DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); DeleteDC(hdc); SelectObject(hDrawingDC, hBms[currInd]); - setImgXYRes(width, height); + if (GetWidth() != oldWidth || GetHeight() != oldHeight) + NotifyDimensionsChanged(); + NotifyImageChanged(); } + +void ImageModel::SaveImage(LPTSTR lpFileName) +{ + SaveDIBToFile(hBms[currInd], lpFileName, hDrawingDC, &fileTime, &fileSize, fileHPPM, fileVPPM); + imageSaved = TRUE; +} + +BOOL ImageModel::IsImageSaved() +{ + return imageSaved; +} + +BOOL ImageModel::HasUndoSteps() +{ + return undoSteps > 0; +} + +BOOL ImageModel::HasRedoSteps() +{ + return redoSteps > 0; +} + +void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY) +{ + int oldWidth = GetWidth(); + int oldHeight = GetHeight(); + Insert((HBITMAP) CopyImage(hBms[currInd], IMAGE_BITMAP, + GetWidth() * nStretchPercentX / 100, + GetHeight() * nStretchPercentY / 100, 0)); + if (GetWidth() != oldWidth || GetHeight() != oldHeight) + NotifyDimensionsChanged(); + NotifyImageChanged(); +} + +int ImageModel::GetWidth() +{ + return GetDIBWidth(hBms[currInd]); +} + +int ImageModel::GetHeight() +{ + return GetDIBHeight(hBms[currInd]); +} + +void ImageModel::InvertColors() +{ + RECT rect = {0, 0, GetWidth(), GetHeight()}; + CopyPrevious(); + InvertRect(hDrawingDC, &rect); + NotifyImageChanged(); +} + +void ImageModel::Clear(COLORREF color) +{ + Rectangle(hDrawingDC, 0 - 1, 0 - 1, GetWidth() + 1, GetHeight() + 1); + NotifyImageChanged(); +} Modified: trunk/reactos/base/applications/mspaint_new/history.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -6,16 +6,32 @@ * PROGRAMMERS: Benedikt Freisen */ -void newReversible(void); +class ImageModel +{ +private: + void NotifyDimensionsChanged(); + void NotifyImageChanged(); +public: + HBITMAP hBms[HISTORYSIZE]; + int currInd; + int undoSteps; + int redoSteps; + BOOL imageSaved; -void undo(void); - -void redo(void); - -void resetToU1(void); - -void clearHistory(void); - -void insertReversible(HBITMAP hbm); - -void cropReversible(int width, int height, int xOffset, int yOffset); + void CopyPrevious(void); + void Undo(void); + void Redo(void); + void ResetToPrevious(void); + void ClearHistory(void); + void Insert(HBITMAP hbm); + void Crop(int nWidth, int nHeight, int nOffsetX = 0, int nOffsetY = 0); + void SaveImage(LPTSTR lpFileName); + BOOL IsImageSaved(); + BOOL HasUndoSteps(); + BOOL HasRedoSteps(); + void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX = 0, int nSkewDegY = 0); + int GetWidth(); + int GetHeight(); + void InvertColors(); + void Clear(COLORREF color = 0x00ffffff); +}; Modified: trunk/reactos/base/applications/mspaint_new/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -18,6 +18,18 @@ extern void zoomTo(int newZoom, int mouseX, int mouseY); + +void +updateCanvasAndScrollbars() +{ + selectionWindow.ShowWindow(SW_HIDE); + imageArea.MoveWindow(3, 3, imageModel.GetWidth() * toolsModel.GetZoom() / 1000, imageModel.GetHeight() * toolsModel.GetZoom() / 1000, FALSE); + scrollboxWindow.Invalidate(TRUE); + imageArea.Invalidate(FALSE); + + scrollboxWindow.SetScrollPos(SB_HORZ, 0, TRUE); + scrollboxWindow.SetScrollPos(SB_VERT, 0, TRUE); +} void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY) { @@ -51,6 +63,8 @@ LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + int imgXRes = imageModel.GetWidth(); + int imgYRes = imageModel.GetHeight(); sizeboxLeftTop.MoveWindow( 0, 0, 3, 3, TRUE); @@ -82,7 +96,9 @@ LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { DefWindowProc(WM_PAINT, wParam, lParam); - HDC hdc = imageArea.GetDC(); + HDC hdc = GetDC(); + int imgXRes = imageModel.GetWidth(); + int imgYRes = imageModel.GetHeight(); StretchBlt(hdc, 0, 0, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, hDrawingDC, 0, 0, imgXRes, imgYRes, SRCCOPY); if (showGrid && (toolsModel.GetZoom() >= 4000)) @@ -101,7 +117,7 @@ } DeleteObject(SelectObject(hdc, oldPen)); } - imageArea.ReleaseDC(hdc); + ReleaseDC(hdc); selectionWindow.Invalidate(FALSE); miniature.Invalidate(FALSE); return 0; @@ -144,7 +160,7 @@ else { SendMessage(WM_LBUTTONUP, wParam, lParam); - undo(); + imageModel.Undo(); } Invalidate(FALSE); if ((toolsModel.GetActiveTool() == TOOL_ZOOM) && (toolsModel.GetZoom() < 8000)) @@ -164,7 +180,7 @@ else { SendMessage(WM_RBUTTONUP, wParam, lParam); - undo(); + imageModel.Undo(); } Invalidate(FALSE); if ((toolsModel.GetActiveTool() == TOOL_ZOOM) && (toolsModel.GetZoom() > 125)) @@ -231,7 +247,7 @@ tme.cbSize = sizeof(TRACKMOUSEEVENT); tme.dwFlags = TME_LEAVE; - tme.hwndTrack = imageArea.m_hWnd; + tme.hwndTrack = m_hWnd; tme.dwHoverTime = 0; TrackMouseEvent(&tme); @@ -252,12 +268,12 @@ { if (xRel < 0) xRel = (xNow < 0) ? -start.x : xRel; - else if (xNow > imgXRes) - xRel = imgXRes-start.x; + else if (xNow > imageModel.GetWidth()) + xRel = imageModel.GetWidth() - start.x; if (yRel < 0) yRel = (yNow < 0) ? -start.y : yRel; - else if (yNow > imgYRes) - yRel = imgYRes-start.y; + else if (yNow > imageModel.GetHeight()) + yRel = imageModel.GetHeight() - start.y; } /* rectsel and shape tools always show non-negative numbers when drawing */ if ((toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_SHAPE)) @@ -316,6 +332,18 @@ { SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) _T("")); if (toolsModel.GetActiveTool() == TOOL_ZOOM) - imageArea.Invalidate(FALSE); - return 0; -} + Invalidate(FALSE); + return 0; +} + +LRESULT CImgAreaWindow::OnImageModelDimensionsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + updateCanvasAndScrollbars(); + return 0; +} + +LRESULT CImgAreaWindow::OnImageModelImageChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + Invalidate(FALSE); + return 0; +} Modified: trunk/reactos/base/applications/mspaint_new/imgarea.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/imgarea.h [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -22,6 +22,8 @@ MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_MOUSELEAVE, OnMouseLeave) + MESSAGE_HANDLER(WM_IMAGEMODELDIMENSIONSCHANGED, OnImageModelDimensionsChanged) + MESSAGE_HANDLER(WM_IMAGEMODELIMAGECHANGED, OnImageModelImageChanged) END_MSG_MAP() BOOL drawing; @@ -36,6 +38,8 @@ LRESULT OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnImageModelDimensionsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnImageModelImageChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); void drawZoomFrame(int mouseX, int mouseY); }; Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -24,11 +24,7 @@ STRETCHSKEW stretchSkew; -HBITMAP hBms[HISTORYSIZE]; -int currInd = 0; -int undoSteps = 0; -int redoSteps = 0; -BOOL imageSaved = TRUE; +ImageModel imageModel; POINT start; POINT last; @@ -214,8 +210,9 @@ SelectObject(hDrawingDC, CreatePen(PS_SOLID, 0, paletteModel.GetFgColor())); SelectObject(hDrawingDC, CreateSolidBrush(paletteModel.GetBgColor())); - hBms[0] = CreateDIBWithProperties(imgXRes, imgYRes); - SelectObject(hDrawingDC, hBms[0]); + //TODO: move to ImageModel + imageModel.hBms[0] = CreateDIBWithProperties(imgXRes, imgYRes); + SelectObject(hDrawingDC, imageModel.hBms[0]); Rectangle(hDrawingDC, 0 - 1, 0 - 1, imgXRes + 1, imgYRes + 1); if (lpszArgument[0] != 0) @@ -227,13 +224,13 @@ TCHAR tempstr[1000]; TCHAR resstr[100]; TCHAR *temp; - insertReversible(bmNew); + imageModel.Insert(bmNew); GetFullPathName(lpszArgument, SIZEOF(filepathname), filepathname, &temp); _tcscpy(filename, temp); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(tempstr, resstr, filename); mainWindow.SetWindowText(tempstr); - clearHistory(); + imageModel.ClearHistory(); isAFile = TRUE; } else Modified: trunk/reactos/base/applications/mspaint_new/miniature.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/miniature.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/miniature.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -27,7 +27,7 @@ HDC hdc; miniature.GetClientRect(&mclient); hdc = miniature.GetDC(); - StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, hDrawingDC, 0, 0, imgXRes, imgYRes, SRCCOPY); + StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, hDrawingDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); miniature.ReleaseDC(hdc); return 0; } Modified: trunk/reactos/base/applications/mspaint_new/mouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/mouse.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/mouse.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -76,33 +76,33 @@ case TOOL_RECT: case TOOL_ELLIPSE: case TOOL_RRECT: - newReversible(); + imageModel.CopyPrevious(); break; case TOOL_RECTSEL: case TOOL_TEXT: - newReversible(); + imageModel.CopyPrevious(); selectionWindow.ShowWindow(SW_HIDE); rectSel_src.right = rectSel_src.left; rectSel_src.bottom = rectSel_src.top; break; case TOOL_RUBBER: - newReversible(); + imageModel.CopyPrevious(); Erase(hdc, x, y, x, y, bg, toolsModel.GetRubberRadius()); break; case TOOL_FILL: - newReversible(); + imageModel.CopyPrevious(); Fill(hdc, x, y, fg); break; case TOOL_PEN: - newReversible(); + imageModel.CopyPrevious(); SetPixel(hdc, x, y, fg); break; case TOOL_BRUSH: - newReversible(); + imageModel.CopyPrevious(); Brush(hdc, x, y, x, y, fg, toolsModel.GetBrushStyle()); break; case TOOL_AIRBRUSH: - newReversible(); + imageModel.CopyPrevious(); Airbrush(hdc, x, y, fg, toolsModel.GetAirBrushWidth()); break; case TOOL_BEZIER: @@ -110,7 +110,7 @@ pointStack[pointSP].y = y; if (pointSP == 0) { - newReversible(); + imageModel.CopyPrevious(); pointSP++; } break; @@ -121,7 +121,7 @@ Poly(hdc, pointStack, pointSP + 1, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); if (pointSP == 0) { - newReversible(); + imageModel.CopyPrevious(); pointSP++; } break; @@ -135,22 +135,22 @@ { case TOOL_FREESEL: if (ptSP == 0) - newReversible(); + imageModel.CopyPrevious(); ptSP++; if (ptSP % 1024 == 0) ptStack = (POINT*) HeapReAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, ptStack, sizeof(POINT) * (ptSP + 1024)); - ptStack[ptSP].x = max(0, min(x, imgXRes)); - ptStack[ptSP].y = max(0, min(y, imgYRes)); - resetToU1(); + ptStack[ptSP].x = max(0, min(x, imageModel.GetWidth())); + ptStack[ptSP].y = max(0, min(y, imageModel.GetHeight())); + imageModel.ResetToPrevious(); Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE, TRUE); /* draw the freehand selection inverted/xored */ break; case TOOL_RECTSEL: case TOOL_TEXT: { POINT temp; - resetToU1(); - temp.x = max(0, min(x, imgXRes)); - temp.y = max(0, min(y, imgYRes)); + imageModel.ResetToPrevious(); + temp.x = max(0, min(x, imageModel.GetWidth())); + temp.y = max(0, min(y, imageModel.GetHeight())); rectSel_dest.left = rectSel_src.left = min(start.x, temp.x); rectSel_dest.top = rectSel_src.top = min(start.y, temp.y); rectSel_dest.right = rectSel_src.right = max(start.x, temp.x); @@ -171,13 +171,13 @@ Airbrush(hdc, x, y, fg, toolsModel.GetAirBrushWidth()); break; case TOOL_LINE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); Line(hdc, start.x, start.y, x, y, fg, toolsModel.GetLineWidth()); break; case TOOL_BEZIER: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; switch (pointSP) @@ -195,13 +195,13 @@ } break; case TOOL_RECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Rect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) @@ -211,13 +211,13 @@ Poly(hdc, pointStack, pointSP + 1, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); break; case TOOL_ELLIPSE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Ellp(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); RRect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); @@ -270,11 +270,11 @@ Poly(hSelDC, ptStackCopy, ptSP + 1, 0x00ffffff, 0x00ffffff, 1, 2, TRUE, FALSE); HeapFree(GetProcessHeap(), 0, ptStackCopy); SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src))); - resetToU1(); + imageModel.ResetToPrevious(); MaskBlt(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hDrawingDC, rectSel_src.left, rectSel_src.top, hSelMask, 0, 0, MAKEROP4(SRCCOPY, WHITENESS)); Poly(hdc, ptStack, ptSP + 1, bg, bg, 1, 2, TRUE, FALSE); - newReversible(); + imageModel.CopyPrevious(); MaskBlt(hDrawingDC, rectSel_src.left, rectSel_src.top, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); @@ -291,7 +291,7 @@ break; } case TOOL_RECTSEL: - resetToU1(); + imageModel.ResetToPrevious(); if ((RECT_WIDTH(rectSel_src) != 0) && (RECT_HEIGHT(rectSel_src) != 0)) { DeleteObject(hSelMask); @@ -299,12 +299,12 @@ DeleteObject(SelectObject(hSelDC, hSelMask)); Rect(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), 0x00ffffff, 0x00ffffff, 1, 2); SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src))); - resetToU1(); + imageModel.ResetToPrevious(); BitBlt(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hDrawingDC, rectSel_src.left, rectSel_src.top, SRCCOPY); Rect(hdc, rectSel_src.left, rectSel_src.top, rectSel_src.right, rectSel_src.bottom, bg, bg, 0, TRUE); - newReversible(); + imageModel.CopyPrevious(); BitBlt(hDrawingDC, rectSel_src.left, rectSel_src.top, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hSelDC, 0, 0, SRCCOPY); @@ -315,10 +315,10 @@ } break; case TOOL_TEXT: - resetToU1(); + imageModel.ResetToPrevious(); if ((RECT_WIDTH(rectSel_src) != 0) && (RECT_HEIGHT(rectSel_src) != 0)) { - newReversible(); + imageModel.CopyPrevious(); placeSelWin(); selectionWindow.ShowWindow(SW_SHOW); @@ -333,7 +333,7 @@ SetPixel(hdc, x, y, fg); break; case TOOL_LINE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); Line(hdc, start.x, start.y, x, y, fg, toolsModel.GetLineWidth()); @@ -344,13 +344,13 @@ pointSP = 0; break; case TOOL_RECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Rect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) @@ -374,13 +374,13 @@ pointSP--; break; case TOOL_ELLIPSE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Ellp(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); RRect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); @@ -403,26 +403,26 @@ case TOOL_RECT: case TOOL_ELLIPSE: case TOOL_RRECT: - newReversible(); + imageModel.CopyPrevious(); break; case TOOL_RUBBER: - newReversible(); + imageModel.CopyPrevious(); Replace(hdc, x, y, x, y, fg, bg, toolsModel.GetRubberRadius()); break; case TOOL_FILL: - newReversible(); + imageModel.CopyPrevious(); Fill(hdc, x, y, bg); break; case TOOL_PEN: - newReversible(); + imageModel.CopyPrevious(); SetPixel(hdc, x, y, bg); break; case TOOL_BRUSH: - newReversible(); + imageModel.CopyPrevious(); Brush(hdc, x, y, x, y, bg, toolsModel.GetBrushStyle()); break; case TOOL_AIRBRUSH: - newReversible(); + imageModel.CopyPrevious(); Airbrush(hdc, x, y, bg, toolsModel.GetAirBrushWidth()); break; case TOOL_BEZIER: @@ -430,7 +430,7 @@ pointStack[pointSP].y = y; if (pointSP == 0) { - newReversible(); + imageModel.CopyPrevious(); pointSP++; } break; @@ -441,7 +441,7 @@ Poly(hdc, pointStack, pointSP + 1, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); if (pointSP == 0) { - newReversible(); + imageModel.CopyPrevious(); pointSP++; } break; @@ -466,13 +466,13 @@ Airbrush(hdc, x, y, bg, toolsModel.GetAirBrushWidth()); break; case TOOL_LINE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); Line(hdc, start.x, start.y, x, y, bg, toolsModel.GetLineWidth()); break; case TOOL_BEZIER: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; switch (pointSP) @@ -490,13 +490,13 @@ } break; case TOOL_RECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Rect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) @@ -506,13 +506,13 @@ Poly(hdc, pointStack, pointSP + 1, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); break; case TOOL_ELLIPSE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Ellp(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); RRect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); @@ -536,7 +536,7 @@ SetPixel(hdc, x, y, bg); break; case TOOL_LINE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); Line(hdc, start.x, start.y, x, y, bg, toolsModel.GetLineWidth()); @@ -547,13 +547,13 @@ pointSP = 0; break; case TOOL_RECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Rect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) @@ -577,13 +577,13 @@ pointSP--; break; case TOOL_ELLIPSE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Ellp(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); RRect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); Modified: trunk/reactos/base/applications/mspaint_new/scrollbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/scrollbox.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/scrollbox.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -74,8 +74,8 @@ } scrollboxWindow.SetScrollInfo(SB_HORZ, &si); scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), imgXRes * toolsModel.GetZoom() / 1000 + 6, - imgYRes * toolsModel.GetZoom() / 1000 + 6, TRUE); + -scrollboxWindow.GetScrollPos(SB_VERT), imageModel.GetWidth() * toolsModel.GetZoom() / 1000 + 6, + imageModel.GetHeight() * toolsModel.GetZoom() / 1000 + 6, TRUE); } return 0; } @@ -109,8 +109,8 @@ } scrollboxWindow.SetScrollInfo(SB_VERT, &si); scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), imgXRes * toolsModel.GetZoom() / 1000 + 6, - imgYRes * toolsModel.GetZoom() / 1000 + 6, TRUE); + -scrollboxWindow.GetScrollPos(SB_VERT), imageModel.GetWidth() * toolsModel.GetZoom() / 1000 + 6, + imageModel.GetHeight() * toolsModel.GetZoom() / 1000 + 6, TRUE); } return 0; } Modified: trunk/reactos/base/applications/mspaint_new/selection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/selection.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/selection.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -175,7 +175,7 @@ { TCHAR sizeStr[100]; POINT deltaUsed; - resetToU1(); + imageModel.ResetToPrevious(); frac.x += GET_X_LPARAM(lParam) - pos.x; frac.y += GET_Y_LPARAM(lParam) - pos.y; delta.x += frac.x * 1000 / toolsModel.GetZoom(); Modified: trunk/reactos/base/applications/mspaint_new/sizebox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/sizebox.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/sizebox.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -45,6 +45,8 @@ TCHAR sizeStr[100]; short xRel; short yRel; + int imgXRes = imageModel.GetWidth(); + int imgYRes = imageModel.GetHeight(); xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / toolsModel.GetZoom(); yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / toolsModel.GetZoom(); if (m_hWnd == sizeboxLeftTop.m_hWnd) @@ -76,24 +78,26 @@ short yRel; ReleaseCapture(); resizing = FALSE; + int imgXRes = imageModel.GetWidth(); + int imgYRes = imageModel.GetHeight(); xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / toolsModel.GetZoom(); yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / toolsModel.GetZoom(); if (m_hWnd == sizeboxLeftTop) - cropReversible(imgXRes - xRel, imgYRes - yRel, xRel, yRel); + imageModel.Crop(imgXRes - xRel, imgYRes - yRel, xRel, yRel); if (m_hWnd == sizeboxCenterTop.m_hWnd) - cropReversible(imgXRes, imgYRes - yRel, 0, yRel); + imageModel.Crop(imgXRes, imgYRes - yRel, 0, yRel); if (m_hWnd == sizeboxRightTop.m_hWnd) - cropReversible(imgXRes + xRel, imgYRes - yRel, 0, yRel); + imageModel.Crop(imgXRes + xRel, imgYRes - yRel, 0, yRel); if (m_hWnd == sizeboxLeftCenter.m_hWnd) - cropReversible(imgXRes - xRel, imgYRes, xRel, 0); + imageModel.Crop(imgXRes - xRel, imgYRes, xRel, 0); if (m_hWnd == sizeboxRightCenter.m_hWnd) - cropReversible(imgXRes + xRel, imgYRes, 0, 0); + imageModel.Crop(imgXRes + xRel, imgYRes, 0, 0); if (m_hWnd == sizeboxLeftBottom.m_hWnd) - cropReversible(imgXRes - xRel, imgYRes + yRel, xRel, 0); + imageModel.Crop(imgXRes - xRel, imgYRes + yRel, xRel, 0); if (m_hWnd == sizeboxCenterBottom.m_hWnd) - cropReversible(imgXRes, imgYRes + yRel, 0, 0); + imageModel.Crop(imgXRes, imgYRes + yRel, 0, 0); if (m_hWnd == sizeboxRightBottom.m_hWnd) - cropReversible(imgXRes + xRel, imgYRes + yRel, 0, 0); + imageModel.Crop(imgXRes + xRel, imgYRes + yRel, 0, 0); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) _T("")); } return 0; Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -15,18 +15,6 @@ #include "registry.h" /* FUNCTIONS ********************************************************/ - -void -updateCanvasAndScrollbars() -{ - selectionWindow.ShowWindow(SW_HIDE); - imageArea.MoveWindow(3, 3, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, FALSE); - scrollboxWindow.Invalidate(TRUE); - imageArea.Invalidate(FALSE); - - scrollboxWindow.SetScrollPos(SB_HORZ, 0, TRUE); - scrollboxWindow.SetScrollPos(SB_VERT, 0, TRUE); -} void zoomTo(int newZoom, int mouseX, int mouseY) @@ -44,7 +32,7 @@ toolsModel.SetZoom(newZoom); selectionWindow.ShowWindow(SW_HIDE); - imageArea.MoveWindow(3, 3, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, FALSE); + imageArea.MoveWindow(3, 3, imageModel.GetWidth() * toolsModel.GetZoom() / 1000, imageModel.GetHeight() * toolsModel.GetZoom() / 1000, FALSE); scrollboxWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE); @@ -87,23 +75,19 @@ { if (isAFile && overwrite) { - SaveDIBToFile(hBms[currInd], filepathname, hDrawingDC, &fileTime, &fileSize, fileHPPM, - fileVPPM); - imageSaved = TRUE; + imageModel.SaveImage(filepathname); } else if (GetSaveFileName(&sfn) != 0) { TCHAR tempstr[1000]; TCHAR resstr[100]; - SaveDIBToFile(hBms[currInd], sfn.lpstrFile, hDrawingDC, &fileTime, &fileSize, - fileHPPM, fileVPPM); + imageModel.SaveImage(sfn.lpstrFile); CopyMemory(filename, sfn.lpstrFileTitle, sizeof(filename)); CopyMemory(filepathname, sfn.lpstrFile, sizeof(filepathname)); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(tempstr, resstr, filename); SetWindowText(tempstr); isAFile = TRUE; - imageSaved = TRUE; } } @@ -111,14 +95,13 @@ { TCHAR tempstr[1000]; TCHAR resstr[100]; - insertReversible(bitmap); - updateCanvasAndScrollbars(); + imageModel.Insert(bitmap); CopyMemory(filename, newfilename, sizeof(filename)); CopyMemory(filepathname, newfilepathname, sizeof(filepathname)); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(tempstr, resstr, filename); SetWindowText(tempstr); - clearHistory(); + imageModel.ClearHistory(); isAFile = TRUE; } @@ -134,7 +117,7 @@ DeleteObject(SelectObject(hSelDC, hSelBm = (HBITMAP) CopyImage(bitmap, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG))); - newReversible(); + imageModel.CopyPrevious(); SetRectEmpty(&rectSel_src); rectSel_dest.left = rectSel_dest.top = 0; rectSel_dest.right = rectSel_dest.left + GetDIBWidth(hSelBm); @@ -189,7 +172,7 @@ LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (!imageSaved) + if (!imageModel.IsImageSaved()) { TCHAR programname[20]; TCHAR saveprompttext[100]; @@ -204,7 +187,7 @@ break; case IDYES: saveImage(FALSE); - if (imageSaved) + if (imageModel.IsImageSaved()) DestroyWindow(); break; } @@ -228,8 +211,8 @@ EnableMenuItem(menu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(isAFile)); break; case 1: /* Edit menu */ - EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(undoSteps > 0)); - EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(redoSteps > 0)); + EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(imageModel.HasUndoSteps())); + EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(imageModel.HasRedoSteps())); EnableMenuItem(menu, IDM_EDITCUT, ENABLED_IF(trueSelection)); EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(trueSelection)); EnableMenuItem(menu, IDM_EDITDELETESELECTION, ENABLED_IF(trueSelection)); @@ -344,7 +327,7 @@ case IDM_FILENEW: { BOOL reset = TRUE; - if (!imageSaved) + if (!imageModel.IsImageSaved()) { TCHAR programname[20]; TCHAR saveprompttext[100]; @@ -355,7 +338,7 @@ switch (MessageBox(temptext, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) { case IDNO: - imageSaved = TRUE; + imageModel.imageSaved = TRUE; //TODO: move to ImageModel break; case IDYES: saveImage(FALSE); @@ -365,12 +348,10 @@ break; } } - if (reset && imageSaved) - { - Rectangle(hDrawingDC, 0 - 1, 0 - 1, imgXRes + 1, imgYRes + 1); - imageArea.Invalidate(FALSE); - updateCanvasAndScrollbars(); - clearHistory(); + if (reset && imageModel.IsImageSaved()) //TODO: move to ImageModel + { + imageModel.Clear(); + imageModel.ClearHistory(); } break; } @@ -401,11 +382,11 @@ SetWallpaper(filepathname, 2, 0); break; case IDM_EDITUNDO: - undo(); + imageModel.Undo(); imageArea.Invalidate(FALSE); break; case IDM_EDITREDO: - redo(); + imageModel.Redo(); imageArea.Invalidate(FALSE); break; case IDM_EDITCOPY: @@ -432,16 +413,16 @@ { /* remove selection window and already painted content using undo(), paint Rect for rectangular selections and Poly for freeform selections */ - undo(); + imageModel.Undo(); if (toolsModel.GetActiveTool() == TOOL_RECTSEL) { - newReversible(); + imageModel.CopyPrevious(); Rect(hDrawingDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, rectSel_dest.bottom, paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); } if (toolsModel.GetActiveTool() == TOOL_FREESEL) { - newReversible(); + imageModel.CopyPrevious(); Poly(hDrawingDC, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE, TRUE); } break; @@ -451,9 +432,10 @@ HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); toolBoxContainer.SendMessage(WM_COMMAND, ID_RECTSEL); + //TODO: do this properly startPaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); - whilePaintingL(hDrawingDC, imgXRes, imgYRes, paletteModel.GetFgColor(), paletteModel.GetBgColor()); - endPaintingL(hDrawingDC, imgXRes, imgYRes, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + whilePaintingL(hDrawingDC, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); + endPaintingL(hDrawingDC, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); break; } case IDM_EDITCOPYTO: @@ -474,31 +456,22 @@ break; case IDM_COLORSEDITPALETTE: if (ChooseColor(&choosecolor)) - { paletteModel.SetFgColor(choosecolor.rgbResult); - paletteWindow.Invalidate(FALSE); - } break; case IDM_COLORSMODERNPALETTE: paletteModel.SelectPalette(1); - paletteWindow.Invalidate(FALSE); break; case IDM_COLORSOLDPALETTE: paletteModel.SelectPalette(2); - paletteWindow.Invalidate(FALSE); break; case IDM_IMAGEINVERTCOLORS: { - RECT tempRect; - newReversible(); - SetRect(&tempRect, 0, 0, imgXRes, imgYRes); - InvertRect(hDrawingDC, &tempRect); - imageArea.Invalidate(FALSE); + imageModel.InvertColors(); break; } case IDM_IMAGEDELETEIMAGE: - newReversible(); - Rect(hDrawingDC, 0, 0, imgXRes, imgYRes, paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); + imageModel.CopyPrevious(); + Rect(hDrawingDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); imageArea.Invalidate(FALSE); break; case IDM_IMAGEROTATEMIRROR: @@ -517,9 +490,9 @@ } else { - newReversible(); - StretchBlt(hDrawingDC, imgXRes - 1, 0, -imgXRes, imgYRes, hDrawingDC, 0, 0, - imgXRes, imgYRes, SRCCOPY); + imageModel.CopyPrevious(); + StretchBlt(hDrawingDC, imageModel.GetWidth() - 1, 0, -imageModel.GetWidth(), imageModel.GetHeight(), hDrawingDC, 0, 0, + imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); imageArea.Invalidate(FALSE); } break; @@ -536,9 +509,9 @@ } else { - newReversible(); - StretchBlt(hDrawingDC, 0, imgYRes - 1, imgXRes, -imgYRes, hDrawingDC, 0, 0, - imgXRes, imgYRes, SRCCOPY); + imageModel.CopyPrevious(); + StretchBlt(hDrawingDC, 0, imageModel.GetHeight() - 1, imageModel.GetWidth(), -imageModel.GetHeight(), hDrawingDC, 0, 0, + imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); imageArea.Invalidate(FALSE); } break; @@ -557,9 +530,9 @@ } else { - newReversible(); - StretchBlt(hDrawingDC, imgXRes - 1, imgYRes - 1, -imgXRes, -imgYRes, hDrawingDC, - 0, 0, imgXRes, imgYRes, SRCCOPY); + imageModel.CopyPrevious(); + StretchBlt(hDrawingDC, imageModel.GetWidth() - 1, imageModel.GetHeight() - 1, -imageModel.GetWidth(), -imageModel.GetHeight(), hDrawingDC, + 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); imageArea.Invalidate(FALSE); } break; @@ -571,8 +544,7 @@ { if (attributesDlg()) { - cropReversible(widthSetInDlg, heightSetInDlg, 0, 0); - updateCanvasAndScrollbars(); + imageModel.Crop(widthSetInDlg, heightSetInDlg, 0, 0); } break; } @@ -580,10 +552,8 @@ { if (changeSizeDlg()) { - insertReversible((HBITMAP) CopyImage(hBms[currInd], IMAGE_BITMAP, - imgXRes * stretchSkew.percentage.x / 100, - imgYRes * stretchSkew.percentage.y / 100, 0)); - updateCanvasAndScrollbars(); + imageModel.StretchSkew(stretchSkew.percentage.x, stretchSkew.percentage.y, + stretchSkew.angle.x, stretchSkew.angle.y); } break; } @@ -591,8 +561,7 @@ toolsModel.SetBackgroundTransparent(!toolsModel.IsBackgroundTransparent()); break; case IDM_IMAGECROP: - insertReversible((HBITMAP) CopyImage(hSelBm, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG)); - updateCanvasAndScrollbars(); + imageModel.Insert((HBITMAP) CopyImage(hSelBm, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG)); break; case IDM_VIEWTOOLBOX:

9 years, 4 months

[gedmurphy] 68371: [DEVMGR] - Rearrange the file structure, move the properties/resource/misc stuff to a ./properties folder - Add a CMakeLists.txt file to combine both old and new code. Should now...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jul 7 11:55:36 2015 New Revision: 68371 URL: http://svn.reactos.org/svn/reactos?rev=68371&view=rev Log: [DEVMGR] - Rearrange the file structure, move the properties/resource/misc stuff to a ./properties folder - Add a CMakeLists.txt file to combine both old and new code. Should now build with the msvc RosBe (doesn't yet run) Added: trunk/reactos/dll/win32/devmgr_new/includes/ (with props) trunk/reactos/dll/win32/devmgr_new/properties/ (with props) trunk/reactos/dll/win32/devmgr_new/properties/advprop.c - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/advprop.c trunk/reactos/dll/win32/devmgr_new/properties/devprblm.c - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/devprblm.c trunk/reactos/dll/win32/devmgr_new/properties/hwpage.c - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/hwpage.c trunk/reactos/dll/win32/devmgr_new/properties/hwresource.c - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/hwresource.c trunk/reactos/dll/win32/devmgr_new/properties/misc.c - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/misc.c trunk/reactos/dll/win32/devmgr_new/properties/stubs.c - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/stubs.c Removed: trunk/reactos/dll/win32/devmgr_new/advprop.c trunk/reactos/dll/win32/devmgr_new/devprblm.c trunk/reactos/dll/win32/devmgr_new/hwpage.c trunk/reactos/dll/win32/devmgr_new/hwresource.c trunk/reactos/dll/win32/devmgr_new/misc.c trunk/reactos/dll/win32/devmgr_new/stubs.c Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake… Removed: trunk/reactos/dll/win32/devmgr_new/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/advpr… Removed: trunk/reactos/dll/win32/devmgr_new/devprblm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devpr… Removed: trunk/reactos/dll/win32/devmgr_new/hwpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/hwpag… Removed: trunk/reactos/dll/win32/devmgr_new/hwresource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/hwres… Removed: trunk/reactos/dll/win32/devmgr_new/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/misc.… Removed: trunk/reactos/dll/win32/devmgr_new/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/stubs…

9 years, 4 months

[bfreisen] 68370: [MSPAINT_NEW] further ATLification, hard-coded observer pattern, minor cleanup (fourth batch of git commits)

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Tue Jul 7 11:44:50 2015 New Revision: 68370 URL: http://svn.reactos.org/svn/reactos?rev=68370&view=rev Log: [MSPAINT_NEW] further ATLification, hard-coded observer pattern, minor cleanup (fourth batch of git commits) Added: trunk/reactos/base/applications/mspaint_new/toolbox.cpp (with props) trunk/reactos/base/applications/mspaint_new/toolbox.h (with props) Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt trunk/reactos/base/applications/mspaint_new/definitions.h trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/imgarea.cpp trunk/reactos/base/applications/mspaint_new/imgarea.h trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/miniature.h trunk/reactos/base/applications/mspaint_new/palette.cpp trunk/reactos/base/applications/mspaint_new/palette.h trunk/reactos/base/applications/mspaint_new/palettemodel.cpp trunk/reactos/base/applications/mspaint_new/palettemodel.h trunk/reactos/base/applications/mspaint_new/precomp.h trunk/reactos/base/applications/mspaint_new/scrollbox.h trunk/reactos/base/applications/mspaint_new/selection.h trunk/reactos/base/applications/mspaint_new/sizebox.h trunk/reactos/base/applications/mspaint_new/textedit.cpp trunk/reactos/base/applications/mspaint_new/textedit.h trunk/reactos/base/applications/mspaint_new/toolsettings.cpp trunk/reactos/base/applications/mspaint_new/toolsettings.h trunk/reactos/base/applications/mspaint_new/toolsmodel.cpp trunk/reactos/base/applications/mspaint_new/toolsmodel.h trunk/reactos/base/applications/mspaint_new/winproc.cpp trunk/reactos/base/applications/mspaint_new/winproc.h Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -20,6 +20,7 @@ selection.cpp sizebox.cpp textedit.cpp + toolbox.cpp toolsettings.cpp toolsmodel.cpp winproc.cpp Modified: trunk/reactos/base/applications/mspaint_new/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/definitions.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -220,3 +220,9 @@ #define IDS_ANGLE 932 #define IDS_LOADERRORTEXT 933 + +#define WM_TOOLSMODELTOOLCHANGED WM_APP +#define WM_TOOLSMODELSETTINGSCHANGED (WM_APP + 1) +#define WM_TOOLSMODELZOOMCHANGED (WM_APP + 2) +#define WM_PALETTEMODELCOLORCHANGED (WM_APP + 3) +#define WM_PALETTEMODELPALETTECHANGED (WM_APP + 4) Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -58,7 +58,6 @@ extern PaletteModel paletteModel; extern HWND hStatusBar; -extern HWND hTrackbarZoom; extern CHOOSECOLOR choosecolor; extern OPENFILENAME ofn; extern OPENFILENAME sfn; @@ -88,6 +87,7 @@ class CMainWindow; class CMiniatureWindow; +class CToolBox; class CToolSettingsWindow; class CPaletteWindow; class CScrollboxWindow; @@ -98,7 +98,7 @@ extern CMainWindow mainWindow; extern CMiniatureWindow miniature; -extern CMainWindow toolBoxContainer; +extern CToolBox toolBoxContainer; extern CToolSettingsWindow toolSettingsWindow; extern CPaletteWindow paletteWindow; extern CScrollboxWindow scrollboxWindow; Modified: trunk/reactos/base/applications/mspaint_new/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -187,7 +187,6 @@ GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom()); if (tempColor != CLR_INVALID) paletteModel.SetFgColor(tempColor); - paletteWindow.Invalidate(FALSE); } SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); } @@ -209,7 +208,6 @@ GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom()); if (tempColor != CLR_INVALID) paletteModel.SetBgColor(tempColor); - paletteWindow.Invalidate(FALSE); } SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); } Modified: trunk/reactos/base/applications/mspaint_new/imgarea.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/imgarea.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -12,7 +12,7 @@ public: DECLARE_WND_CLASS_EX(_T("ImgAreaWindow"), CS_DBLCLKS, COLOR_BTNFACE) - BEGIN_MSG_MAP(CPaletteWindow) + BEGIN_MSG_MAP(CImgAreaWindow) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -48,7 +48,6 @@ PaletteModel paletteModel; HWND hStatusBar; -HWND hTrackbarZoom; CHOOSECOLOR choosecolor; OPENFILENAME ofn; OPENFILENAME sfn; @@ -78,7 +77,7 @@ CMainWindow mainWindow; CMiniatureWindow miniature; -CMainWindow toolBoxContainer; +CToolBox toolBoxContainer; CToolSettingsWindow toolSettingsWindow; CPaletteWindow paletteWindow; CScrollboxWindow scrollboxWindow; @@ -106,12 +105,7 @@ TCHAR progtitle[1000]; TCHAR resstr[100]; HMENU menu; - HWND hToolbar; - HIMAGELIST hImageList; HANDLE haccel; - HBITMAP tempBm; - int i; - TCHAR tooltips[16][30]; HDC hDC; TCHAR *c; @@ -155,11 +149,11 @@ /* create main window */ RECT mainWindowPos = {0, 0, 544, 375}; // FIXME: use equivalent of CW_USEDEFAULT for position - hwnd = mainWindow.Create(HWND_DESKTOP, mainWindowPos, progtitle, WS_OVERLAPPEDWINDOW, 0, 0U, NULL); + hwnd = mainWindow.Create(HWND_DESKTOP, mainWindowPos, progtitle, WS_OVERLAPPEDWINDOW); RECT miniaturePos = {180, 200, 180 + 120, 200 + 100}; miniature.Create(hwnd, miniaturePos, miniaturetitle, - WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, WS_EX_PALETTEWINDOW, 0U, NULL); + WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, WS_EX_PALETTEWINDOW); /* loading and setting the window menu from resource */ menu = LoadMenu(hThisInstance, MAKEINTRESOURCE(ID_MENU)); @@ -178,85 +172,40 @@ hCurPen = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_PEN)); hCurAirbrush = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_AIRBRUSH)); - CreateWindowEx(0, _T("STATIC"), _T(""), WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ, 0, 0, 5000, 2, hwnd, NULL, + CreateWindowEx(0, _T("STATIC"), NULL, WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ, 0, 0, 5000, 2, hwnd, NULL, hThisInstance, NULL); RECT toolBoxContainerPos = {2, 2, 2 + 52, 2 + 350}; - toolBoxContainer.Create(hwnd, toolBoxContainerPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); - /* creating the 16 bitmap radio buttons and setting the bitmap */ - - - /* - * FIXME: Unintentionally there is a line above the tool bar (hidden by y-offset). - * To prevent cropping of the buttons height has been increased from 200 to 205 - */ - hToolbar = - CreateWindowEx(0, TOOLBARCLASSNAME, NULL, - WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS, - 1, -2, 50, 205, toolBoxContainer.m_hWnd, NULL, hThisInstance, NULL); - hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); - SendMessage(hToolbar, TB_SETIMAGELIST, 0, (LPARAM) hImageList); - tempBm = (HBITMAP) LoadImage(hThisInstance, MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0); - ImageList_AddMasked(hImageList, tempBm, 0xff00ff); - DeleteObject(tempBm); - SendMessage(hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - - for(i = 0; i < 16; i++) - { - TBBUTTON tbbutton; - int wrapnow = 0; - - if (i % 2 == 1) - wrapnow = TBSTATE_WRAP; - - LoadString(hThisInstance, IDS_TOOLTIP1 + i, tooltips[i], 30); - ZeroMemory(&tbbutton, sizeof(TBBUTTON)); - tbbutton.iString = (INT_PTR) tooltips[i]; - tbbutton.fsStyle = TBSTYLE_CHECKGROUP; - tbbutton.fsState = TBSTATE_ENABLED | wrapnow; - tbbutton.idCommand = ID_FREESEL + i; - tbbutton.iBitmap = i; - SendMessage(hToolbar, TB_ADDBUTTONS, 1, (LPARAM) &tbbutton); - } - - SendMessage(hToolbar, TB_CHECKBUTTON, ID_PEN, MAKELONG(TRUE, 0)); - SendMessage(hToolbar, TB_SETMAXTEXTROWS, 0, 0); - SendMessage(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(25, 25)); - + toolBoxContainer.Create(hwnd, toolBoxContainerPos, NULL, WS_CHILD | WS_VISIBLE); /* creating the tool settings child window */ RECT toolSettingsWindowPos = {5, 208, 5 + 42, 208 + 140}; - toolSettingsWindow.Create(toolBoxContainer.m_hWnd, toolSettingsWindowPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); - hTrackbarZoom = - CreateWindowEx(0, TRACKBAR_CLASS, _T(""), WS_CHILD | TBS_VERT | TBS_AUTOTICKS, 1, 1, 40, 64, - toolSettingsWindow.m_hWnd, NULL, hThisInstance, NULL); - SendMessage(hTrackbarZoom, TBM_SETRANGE, (WPARAM) TRUE, (LPARAM) MAKELONG(0, 6)); - SendMessage(hTrackbarZoom, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 3); + toolSettingsWindow.Create(toolBoxContainer.m_hWnd, toolSettingsWindowPos, NULL, WS_CHILD | WS_VISIBLE); /* creating the palette child window */ RECT paletteWindowPos = {56, 9, 56 + 255, 9 + 32}; - paletteWindow.Create(hwnd, paletteWindowPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); + paletteWindow.Create(hwnd, paletteWindowPos, NULL, WS_CHILD | WS_VISIBLE); /* creating the scroll box */ RECT scrollboxWindowPos = {56, 49, 56 + 472, 49 + 248}; - scrollboxWindow.Create(hwnd, scrollboxWindowPos, _T(""), - WS_CHILD | WS_GROUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, WS_EX_CLIENTEDGE, 0U, NULL); + scrollboxWindow.Create(hwnd, scrollboxWindowPos, NULL, + WS_CHILD | WS_GROUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, WS_EX_CLIENTEDGE); /* creating the status bar */ hStatusBar = - CreateWindowEx(0, STATUSCLASSNAME, _T(""), SBARS_SIZEGRIP | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, + CreateWindowEx(0, STATUSCLASSNAME, NULL, SBARS_SIZEGRIP | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, hThisInstance, NULL); SendMessage(hStatusBar, SB_SETMINHEIGHT, 21, 0); RECT scrlClientWindowPos = {0, 0, 0 + 500, 0 + 500}; - scrlClientWindow.Create(scrollboxWindow.m_hWnd, scrlClientWindowPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); + scrlClientWindow.Create(scrollboxWindow.m_hWnd, scrlClientWindowPos, NULL, WS_CHILD | WS_VISIBLE); /* create selection window (initially hidden) */ RECT selectionWindowPos = {350, 0, 350 + 100, 0 + 100}; - selectionWindow.Create(scrlClientWindow.m_hWnd, selectionWindowPos, _T(""), WS_CHILD | BS_OWNERDRAW, 0, 0U, NULL); + selectionWindow.Create(scrlClientWindow.m_hWnd, selectionWindowPos, NULL, WS_CHILD | BS_OWNERDRAW); /* creating the window inside the scroll box, on which the image in hDrawingDC's bitmap is drawn */ RECT imageAreaPos = {3, 3, 3 + imgXRes, 3 + imgYRes}; - imageArea.Create(scrlClientWindow.m_hWnd, imageAreaPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); + imageArea.Create(scrlClientWindow.m_hWnd, imageAreaPos, NULL, WS_CHILD | WS_VISIBLE); hDC = imageArea.GetDC(); hDrawingDC = CreateCompatibleDC(hDC); @@ -339,14 +288,14 @@ /* creating the size boxes */ RECT sizeboxPos = {0, 0, 0 + 3, 0 + 3}; - sizeboxLeftTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); - sizeboxCenterTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); - sizeboxRightTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); - sizeboxLeftCenter.Create(scrlClientWindow.m_hWnd, sizeboxPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); - sizeboxRightCenter.Create(scrlClientWindow.m_hWnd, sizeboxPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); - sizeboxLeftBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); - sizeboxCenterBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); - sizeboxRightBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, _T(""), WS_CHILD | WS_VISIBLE, 0, 0U, NULL); + sizeboxLeftTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxCenterTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxRightTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxLeftCenter.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxRightCenter.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxLeftBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxCenterBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxRightBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); /* placing the size boxes around the image */ imageArea.SendMessage(WM_SIZE, 0, 0); @@ -355,12 +304,7 @@ /* creating the text editor window for the text tool */ RECT textEditWindowPos = {300, 0, 300 + 300, 0 + 200}; - textEditWindow.Create(hwnd, textEditWindowPos, _T(""), WS_OVERLAPPEDWINDOW, 0, 0U, NULL); - /* creating the edit control within the editor window */ - hwndEditCtl = - CreateWindowEx(WS_EX_CLIENTEDGE, _T("EDIT"), _T(""), - WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, - 0, 0, 100, 100, textEditWindow.m_hWnd, NULL, hThisInstance, NULL); + textEditWindow.Create(hwnd, textEditWindowPos, NULL, WS_OVERLAPPEDWINDOW); /* Make the window visible on the screen */ ShowWindow (hwnd, nFunsterStil); Modified: trunk/reactos/base/applications/mspaint_new/miniature.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/miniature.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/miniature.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -12,7 +12,7 @@ public: DECLARE_WND_CLASS_EX(_T("MiniatureWindow"), CS_DBLCLKS, COLOR_BTNFACE) - BEGIN_MSG_MAP(CPaletteWindow) + BEGIN_MSG_MAP(CMiniatureWindow) MESSAGE_HANDLER(WM_CLOSE, OnClose) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) Modified: trunk/reactos/base/applications/mspaint_new/palette.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/palette.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/palette.cpp [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -63,7 +63,6 @@ if (GET_X_LPARAM(lParam) >= 31) { paletteModel.SetFgColor(paletteModel.GetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14)); - InvalidateRect(NULL, FALSE); if (toolsModel.GetActiveTool() == 10) ForceRefreshSelectionContents(); } @@ -75,7 +74,6 @@ if (GET_X_LPARAM(lParam) >= 31) { paletteModel.SetBgColor(paletteModel.GetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14)); - InvalidateRect(NULL, FALSE); if (toolsModel.GetActiveTool() == 10) ForceRefreshSelectionContents(); } @@ -90,7 +88,6 @@ paletteModel.SetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14, choosecolor.rgbResult); paletteModel.SetFgColor(choosecolor.rgbResult); - InvalidateRect(NULL, FALSE); if (toolsModel.GetActiveTool() == 10) ForceRefreshSelectionContents(); } @@ -105,9 +102,20 @@ paletteModel.SetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14, choosecolor.rgbResult); paletteModel.SetBgColor(choosecolor.rgbResult); - InvalidateRect(NULL, FALSE); if (toolsModel.GetActiveTool() == 10) ForceRefreshSelectionContents(); } return 0; } + +LRESULT CPaletteWindow::OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + InvalidateRect(NULL, FALSE); + return 0; +} + +LRESULT CPaletteWindow::OnPaletteModelPaletteChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + InvalidateRect(NULL, FALSE); + return 0; +} Modified: trunk/reactos/base/applications/mspaint_new/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/palette.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/palette.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -17,6 +17,8 @@ MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnLButtonDblClk) MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnRButtonDblClk) + MESSAGE_HANDLER(WM_PALETTEMODELCOLORCHANGED, OnPaletteModelColorChanged) + MESSAGE_HANDLER(WM_PALETTEMODELPALETTECHANGED, OnPaletteModelPaletteChanged) END_MSG_MAP() LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -24,4 +26,6 @@ LRESULT OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnPaletteModelPaletteChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; Modified: trunk/reactos/base/applications/mspaint_new/palettemodel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/palettemodel.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/palettemodel.cpp [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -45,6 +45,7 @@ else return; m_nSelectedPalette = nPalette; + NotifyPaletteChanged(); } int PaletteModel::GetColor(int nIndex) @@ -58,7 +59,10 @@ void PaletteModel::SetColor(int nIndex, int newColor) { if (nIndex < 28) + { m_colors[nIndex] = newColor; + NotifyPaletteChanged(); + } } int PaletteModel::GetFgColor() @@ -69,6 +73,7 @@ void PaletteModel::SetFgColor(int newColor) { m_fgColor = newColor; + NotifyColorChanged(); } int PaletteModel::GetBgColor() @@ -79,4 +84,15 @@ void PaletteModel::SetBgColor(int newColor) { m_bgColor = newColor; + NotifyColorChanged(); } + +void PaletteModel::NotifyColorChanged() +{ + paletteWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); +} + +void PaletteModel::NotifyPaletteChanged() +{ + paletteWindow.SendMessage(WM_PALETTEMODELPALETTECHANGED); +} Modified: trunk/reactos/base/applications/mspaint_new/palettemodel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/palettemodel.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/palettemodel.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -15,6 +15,10 @@ int m_nSelectedPalette; int m_fgColor; int m_bgColor; + + void NotifyColorChanged(); + void NotifyPaletteChanged(); + public: PaletteModel(); int SelectedPalette(); Modified: trunk/reactos/base/applications/mspaint_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -32,6 +32,7 @@ #include "selection.h" #include "sizebox.h" #include "textedit.h" +#include "toolbox.h" #include "toolsettings.h" #include "toolsmodel.h" #include "winproc.h" Modified: trunk/reactos/base/applications/mspaint_new/scrollbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/scrollbox.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/scrollbox.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -11,7 +11,7 @@ public: DECLARE_WND_CLASS_EX(_T("Scrollbox"), 0, COLOR_APPWORKSPACE) - BEGIN_MSG_MAP(CPaletteWindow) + BEGIN_MSG_MAP(CScrollboxWindow) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_HSCROLL, OnHScroll) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) Modified: trunk/reactos/base/applications/mspaint_new/selection.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/selection.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/selection.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -11,7 +11,7 @@ public: DECLARE_WND_CLASS_EX(_T("Selection"), CS_DBLCLKS, COLOR_BTNFACE) - BEGIN_MSG_MAP(CPaletteWindow) + BEGIN_MSG_MAP(CSelectionWindow) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) Modified: trunk/reactos/base/applications/mspaint_new/sizebox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/sizebox.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/sizebox.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -11,7 +11,7 @@ public: DECLARE_WND_CLASS_EX(_T("Sizebox"), CS_DBLCLKS, COLOR_HIGHLIGHT) - BEGIN_MSG_MAP(CPaletteWindow) + BEGIN_MSG_MAP(CSizeboxWindow) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) Modified: trunk/reactos/base/applications/mspaint_new/textedit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/textedit.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/textedit.cpp [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -11,12 +11,21 @@ #include "precomp.h" /* FUNCTIONS ********************************************************/ +LRESULT CTextEditWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + /* creating the edit control within the editor window */ + RECT editControlPos = {0, 0, 0 + 100, 0 + 100}; + hwndEditCtl = editControl.Create(_T("EDIT"), m_hWnd, editControlPos, NULL, + WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + WS_EX_CLIENTEDGE); + return 0; +} LRESULT CTextEditWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { RECT clientRect; GetClientRect(&clientRect); - ::MoveWindow(hwndEditCtl, clientRect.left, clientRect.top, RECT_WIDTH(clientRect), RECT_HEIGHT(clientRect), TRUE); + editControl.MoveWindow(clientRect.left, clientRect.top, RECT_WIDTH(clientRect), RECT_HEIGHT(clientRect), TRUE); return 0; } @@ -33,12 +42,18 @@ case EN_UPDATE: { HeapFree(GetProcessHeap(), 0, textToolText); - textToolTextMaxLen = ::GetWindowTextLength(hwndEditCtl) + 1; + textToolTextMaxLen = editControl.GetWindowTextLength() + 1; textToolText = (LPTSTR) HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(TCHAR) * textToolTextMaxLen); - ::GetWindowText(hwndEditCtl, textToolText, textToolTextMaxLen); + editControl.GetWindowText(textToolText, textToolTextMaxLen); ForceRefreshSelectionContents(); break; } } return 0; } + +LRESULT CTextEditWindow::OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + ShowWindow((wParam == TOOL_TEXT) ? SW_SHOW : SW_HIDE); + return 0; +} Modified: trunk/reactos/base/applications/mspaint_new/textedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/textedit.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/textedit.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -11,13 +11,19 @@ public: DECLARE_WND_CLASS_EX(_T("TextEdit"), CS_DBLCLKS, COLOR_BTNFACE) - BEGIN_MSG_MAP(CPaletteWindow) + BEGIN_MSG_MAP(CTextEditWindow) + MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CLOSE, OnClose) MESSAGE_HANDLER(WM_COMMAND, OnCommand) + MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) END_MSG_MAP() + CWindow editControl; + + LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; Added: trunk/reactos/base/applications/mspaint_new/toolbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/toolbox.cpp (added) +++ trunk/reactos/base/applications/mspaint_new/toolbox.cpp [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -0,0 +1,135 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/toolbox.cpp + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * PROGRAMMERS: Benedikt Freisen + */ + +/* INCLUDES *********************************************************/ + +#include "precomp.h" + +/* FUNCTIONS ********************************************************/ + +LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + HIMAGELIST hImageList; + HBITMAP tempBm; + int i; + TCHAR tooltips[16][30]; + + /* + * FIXME: Unintentionally there is a line above the tool bar (hidden by y-offset). + * To prevent cropping of the buttons height has been increased from 200 to 205 + */ + RECT toolbarPos = {1, -2, 1 + 50, -2 + 205}; + toolbar.Create(TOOLBARCLASSNAME, m_hWnd, toolbarPos, NULL, + WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS); + hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); + toolbar.SendMessage(TB_SETIMAGELIST, 0, (LPARAM) hImageList); + tempBm = (HBITMAP) LoadImage((HINSTANCE) GetWindowLong(GWL_HINSTANCE), MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0); + ImageList_AddMasked(hImageList, tempBm, 0xff00ff); + DeleteObject(tempBm); + toolbar.SendMessage(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + + for(i = 0; i < 16; i++) + { + TBBUTTON tbbutton; + int wrapnow = 0; + + if (i % 2 == 1) + wrapnow = TBSTATE_WRAP; + + LoadString((HINSTANCE) GetWindowLong(GWL_HINSTANCE), IDS_TOOLTIP1 + i, tooltips[i], 30); + ZeroMemory(&tbbutton, sizeof(TBBUTTON)); + tbbutton.iString = (INT_PTR) tooltips[i]; + tbbutton.fsStyle = TBSTYLE_CHECKGROUP; + tbbutton.fsState = TBSTATE_ENABLED | wrapnow; + tbbutton.idCommand = ID_FREESEL + i; + tbbutton.iBitmap = i; + toolbar.SendMessage(TB_ADDBUTTONS, 1, (LPARAM) &tbbutton); + } + + toolbar.SendMessage(TB_CHECKBUTTON, ID_PEN, MAKELPARAM(TRUE, 0)); + toolbar.SendMessage(TB_SETMAXTEXTROWS, 0, 0); + toolbar.SendMessage(TB_SETBUTTONSIZE, 0, MAKELPARAM(25, 25)); + + return 0; +} + +LRESULT CToolBox::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + SetCursor(LoadCursor(NULL, IDC_ARROW)); + return 0; +} + +LRESULT CToolBox::OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + toolbar.SendMessage(WM_SYSCOLORCHANGE, 0, 0); + return 0; +} + +LRESULT CToolBox::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + switch (LOWORD(wParam)) + { + case ID_FREESEL: + toolsModel.SetActiveTool(1); + break; + case ID_RECTSEL: + toolsModel.SetActiveTool(2); + break; + case ID_RUBBER: + toolsModel.SetActiveTool(3); + break; + case ID_FILL: + toolsModel.SetActiveTool(4); + break; + case ID_COLOR: + toolsModel.SetActiveTool(5); + break; + case ID_ZOOM: + toolsModel.SetActiveTool(6); + break; + case ID_PEN: + toolsModel.SetActiveTool(7); + break; + case ID_BRUSH: + toolsModel.SetActiveTool(8); + break; + case ID_AIRBRUSH: + toolsModel.SetActiveTool(9); + break; + case ID_TEXT: + toolsModel.SetActiveTool(10); + break; + case ID_LINE: + toolsModel.SetActiveTool(11); + break; + case ID_BEZIER: + toolsModel.SetActiveTool(12); + break; + case ID_RECT: + toolsModel.SetActiveTool(13); + break; + case ID_SHAPE: + toolsModel.SetActiveTool(14); + break; + case ID_ELLIPSE: + toolsModel.SetActiveTool(15); + break; + case ID_RRECT: + toolsModel.SetActiveTool(16); + break; + } + return 0; +} + +LRESULT CToolBox::OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + selectionWindow.ShowWindow(SW_HIDE); + pointSP = 0; // resets the point-buffer of the polygon and bezier functions + return 0; +} Propchange: trunk/reactos/base/applications/mspaint_new/toolbox.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mspaint_new/toolbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/toolbox.h (added) +++ trunk/reactos/base/applications/mspaint_new/toolbox.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -0,0 +1,30 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/toolbox.h + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * PROGRAMMERS: Benedikt Freisen + */ + +class CToolBox : public CWindowImpl<CMainWindow> +{ +public: + DECLARE_WND_CLASS_EX(_T("ToolBox"), CS_DBLCLKS, COLOR_BTNFACE) + + BEGIN_MSG_MAP(CToolBox) + MESSAGE_HANDLER(WM_CREATE, OnCreate) + MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) + MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) + MESSAGE_HANDLER(WM_COMMAND, OnCommand) + MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) + END_MSG_MAP() + + CWindow toolbar; + + LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); +}; Propchange: trunk/reactos/base/applications/mspaint_new/toolbox.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mspaint_new/toolsettings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/toolsettings.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/toolsettings.cpp [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -14,9 +14,18 @@ extern void zoomTo(int, int, int); +LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, WINBOOL& bHandled) +{ + RECT trackbarZoomPos = {1, 1, 1 + 40, 1 + 64}; + trackbarZoom.Create(TRACKBAR_CLASS, m_hWnd, trackbarZoomPos, NULL, WS_CHILD | TBS_VERT | TBS_AUTOTICKS); + trackbarZoom.SendMessage(TBM_SETRANGE, (WPARAM) TRUE, MAKELPARAM(0, 6)); + trackbarZoom.SendMessage(TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 3); + return 0; +} + LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - zoomTo(125 << SendMessage(hTrackbarZoom, TBM_GETPOS, 0, 0), 0, 0); + zoomTo(125 << trackbarZoom.SendMessage(TBM_GETPOS, 0, 0), 0, 0); return 0; } @@ -181,25 +190,17 @@ if ((y > 1) && (y < 64)) { toolsModel.SetBackgroundTransparent((y - 2) / 31); - InvalidateRect(NULL, TRUE); ForceRefreshSelectionContents(); } break; case TOOL_RUBBER: if ((y > 1) && (y < 62)) - { toolsModel.SetRubberRadius((y - 2) / 15 + 2); - InvalidateRect(NULL, TRUE); - } break; case TOOL_BRUSH: - if ((x > 1) && (x < 40) && (y > 1) - && (y < 62)) - { + if ((x > 1) && (x < 40) && (y > 1) && (y < 62)) toolsModel.SetBrushStyle((y - 2) / 15 * 3 + (x - 2) / 13); - InvalidateRect(NULL, TRUE); - } break; case TOOL_AIRBRUSH: if (y < 62) @@ -218,32 +219,49 @@ else toolsModel.SetAirBrushWidth(12); } - InvalidateRect(NULL, TRUE); } break; case TOOL_LINE: case TOOL_BEZIER: if (y <= 62) - { toolsModel.SetLineWidth((y - 2) / 12 + 1); - InvalidateRect(NULL, TRUE); - } break; case TOOL_RECT: case TOOL_SHAPE: case TOOL_ELLIPSE: case TOOL_RRECT: if (y <= 60) - { toolsModel.SetShapeStyle((y - 2) / 20); - InvalidateRect(NULL, TRUE); - } if ((y >= 70) && (y <= 132)) - { toolsModel.SetLineWidth((y - 72) / 12 + 1); - InvalidateRect(NULL, TRUE); - } break; } return 0; } + +LRESULT CToolSettingsWindow::OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + Invalidate(); + trackbarZoom.ShowWindow((wParam == TOOL_ZOOM) ? SW_SHOW : SW_HIDE); + return 0; +} + +LRESULT CToolSettingsWindow::OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + Invalidate(); + return 0; +} + +LRESULT CToolSettingsWindow::OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + int tbPos = 0; + int tempZoom = toolsModel.GetZoom(); + + while (tempZoom > 125) + { + tbPos++; + tempZoom = tempZoom >> 1; + } + trackbarZoom.SendMessage(TBM_SETPOS, (WPARAM) TRUE, (LPARAM) tbPos); + return 0; +} Modified: trunk/reactos/base/applications/mspaint_new/toolsettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/toolsettings.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/toolsettings.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -11,13 +11,23 @@ public: DECLARE_WND_CLASS_EX(_T("ToolSettings"), CS_DBLCLKS, COLOR_BTNFACE) - BEGIN_MSG_MAP(CPaletteWindow) + BEGIN_MSG_MAP(CToolSettingsWindow) + MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) + MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) + MESSAGE_HANDLER(WM_TOOLSMODELZOOMCHANGED, OnToolsModelZoomChanged) END_MSG_MAP() + CWindow trackbarZoom; + + LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; Modified: trunk/reactos/base/applications/mspaint_new/toolsmodel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/toolsmodel.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/toolsmodel.cpp [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -32,6 +32,7 @@ void ToolsModel::SetLineWidth(int nLineWidth) { m_lineWidth = nLineWidth; + NotifyToolSettingsChanged(); } int ToolsModel::GetShapeStyle() @@ -42,6 +43,7 @@ void ToolsModel::SetShapeStyle(int nShapeStyle) { m_shapeStyle = nShapeStyle; + NotifyToolSettingsChanged(); } int ToolsModel::GetBrushStyle() @@ -52,6 +54,7 @@ void ToolsModel::SetBrushStyle(int nBrushStyle) { m_brushStyle = nBrushStyle; + NotifyToolSettingsChanged(); } int ToolsModel::GetActiveTool() @@ -62,6 +65,7 @@ void ToolsModel::SetActiveTool(int nActiveTool) { m_activeTool = nActiveTool; + NotifyToolChanged(); } int ToolsModel::GetAirBrushWidth() @@ -72,6 +76,7 @@ void ToolsModel::SetAirBrushWidth(int nAirBrushWidth) { m_airBrushWidth = nAirBrushWidth; + NotifyToolSettingsChanged(); } int ToolsModel::GetRubberRadius() @@ -82,6 +87,7 @@ void ToolsModel::SetRubberRadius(int nRubberRadius) { m_rubberRadius = nRubberRadius; + NotifyToolSettingsChanged(); } BOOL ToolsModel::IsBackgroundTransparent() @@ -92,6 +98,7 @@ void ToolsModel::SetBackgroundTransparent(BOOL bTransparent) { m_transpBg = bTransparent; + NotifyToolSettingsChanged(); } int ToolsModel::GetZoom() @@ -102,4 +109,22 @@ void ToolsModel::SetZoom(int nZoom) { m_zoom = nZoom; + NotifyZoomChanged(); } + +void ToolsModel::NotifyToolChanged() +{ + toolBoxContainer.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); + toolSettingsWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); + textEditWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); +} + +void ToolsModel::NotifyToolSettingsChanged() +{ + toolSettingsWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); +} + +void ToolsModel::NotifyZoomChanged() +{ + toolSettingsWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); +} Modified: trunk/reactos/base/applications/mspaint_new/toolsmodel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/toolsmodel.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/toolsmodel.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -19,6 +19,11 @@ int m_rubberRadius; BOOL m_transpBg; int m_zoom; + + void NotifyToolChanged(); + void NotifyToolSettingsChanged(); + void NotifyZoomChanged(); + public: ToolsModel(); int GetLineWidth(); Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -16,16 +16,6 @@ /* FUNCTIONS ********************************************************/ -void CMainWindow::selectTool(int tool) -{ - selectionWindow.ShowWindow(SW_HIDE); - toolsModel.SetActiveTool(tool); - pointSP = 0; // resets the point-buffer of the polygon and bezier functions - toolSettingsWindow.Invalidate(TRUE); - ::ShowWindow(hTrackbarZoom, (tool == TOOL_ZOOM) ? SW_SHOW : SW_HIDE); - textEditWindow.ShowWindow((tool == TOOL_TEXT) ? SW_SHOW : SW_HIDE); -} - void updateCanvasAndScrollbars() { @@ -41,9 +31,6 @@ void zoomTo(int newZoom, int mouseX, int mouseY) { - int tbPos = 0; - int tempZoom = newZoom; - RECT clientRectScrollbox; RECT clientRectImageArea; int x, y, w, h; @@ -61,22 +48,15 @@ scrollboxWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE); - scrollboxWindow.SendMessage(WM_HSCROLL, SB_THUMBPOSITION | (x << 16), 0); - scrollboxWindow.SendMessage(WM_VSCROLL, SB_THUMBPOSITION | (y << 16), 0); - - while (tempZoom > 125) - { - tbPos++; - tempZoom = tempZoom >> 1; - } - SendMessage(hTrackbarZoom, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) tbPos); + scrollboxWindow.SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); + scrollboxWindow.SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); } void CMainWindow::alignChildrenToMainWindow() { int x, y, w, h; RECT clientRect; - mainWindow.GetClientRect(&clientRect); + GetClientRect(&clientRect); if (toolBoxContainer.IsWindowVisible()) { @@ -121,7 +101,7 @@ CopyMemory(filepathname, sfn.lpstrFile, sizeof(filepathname)); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(tempstr, resstr, filename); - mainWindow.SetWindowText(tempstr); + SetWindowText(tempstr); isAFile = TRUE; imageSaved = TRUE; } @@ -148,8 +128,8 @@ HBITMAP hTempMask; HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); - SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0)); - SendMessage(window, WM_COMMAND, ID_RECTSEL, 0); + SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); + toolBoxContainer.SendMessage(WM_COMMAND, ID_RECTSEL); DeleteObject(SelectObject(hSelDC, hSelBm = (HBITMAP) CopyImage(bitmap, IMAGE_BITMAP, 0, 0, @@ -290,25 +270,19 @@ LRESULT CMainWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_hWnd == mainWindow.m_hWnd) - { - int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; - SendMessage(hStatusBar, WM_SIZE, wParam, lParam); - SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); - alignChildrenToMainWindow(); - Invalidate(TRUE); - } + int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; + SendMessage(hStatusBar, WM_SIZE, wParam, lParam); + SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); + alignChildrenToMainWindow(); + Invalidate(TRUE); return 0; } LRESULT CMainWindow::OnGetMinMaxInfo(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_hWnd == mainWindow.m_hWnd) - { - MINMAXINFO *mm = (LPMINMAXINFO) lParam; - mm->ptMinTrackSize.x = 330; - mm->ptMinTrackSize.y = 430; - } + MINMAXINFO *mm = (LPMINMAXINFO) lParam; + mm->ptMinTrackSize.x = 330; + mm->ptMinTrackSize.y = 430; return 0; } @@ -357,12 +331,12 @@ TCHAR infotext[200]; LoadString(hProgInstance, IDS_INFOTITLE, infotitle, SIZEOF(infotitle)); LoadString(hProgInstance, IDS_INFOTEXT, infotext, SIZEOF(infotext)); - ShellAbout(mainWindow.m_hWnd, infotitle, infotext, paintIcon); + ShellAbout(m_hWnd, infotitle, infotext, paintIcon); DeleteObject(paintIcon); break; } case IDM_HELPHELPTOPICS: - HtmlHelp(mainWindow.m_hWnd, _T("help\\Paint.chm"), 0, 0); + HtmlHelp(m_hWnd, _T("help\\Paint.chm"), 0, 0); break; case IDM_FILEEXIT: SendMessage(WM_CLOSE, wParam, lParam); @@ -475,8 +449,8 @@ case IDM_EDITSELECTALL: { HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); - SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0)); - SendMessage(WM_COMMAND, ID_RECTSEL, 0); + SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); + toolBoxContainer.SendMessage(WM_COMMAND, ID_RECTSEL); startPaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); whilePaintingL(hDrawingDC, imgXRes, imgYRes, paletteModel.GetFgColor(), paletteModel.GetBgColor()); endPaintingL(hDrawingDC, imgXRes, imgYRes, paletteModel.GetFgColor(), paletteModel.GetBgColor()); @@ -615,7 +589,6 @@ } case IDM_IMAGEDRAWOPAQUE: toolsModel.SetBackgroundTransparent(!toolsModel.IsBackgroundTransparent()); - toolSettingsWindow.Invalidate(TRUE); break; case IDM_IMAGECROP: insertReversible((HBITMAP) CopyImage(hSelBm, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG)); @@ -667,54 +640,6 @@ case IDM_VIEWZOOM800: zoomTo(8000, 0, 0); break; - case ID_FREESEL: - selectTool(1); - break; - case ID_RECTSEL: - selectTool(2); - break; - case ID_RUBBER: - selectTool(3); - break; - case ID_FILL: - selectTool(4); - break; - case ID_COLOR: - selectTool(5); - break; - case ID_ZOOM: - selectTool(6); - break; - case ID_PEN: - selectTool(7); - break; - case ID_BRUSH: - selectTool(8); - break; - case ID_AIRBRUSH: - selectTool(9); - break; - case ID_TEXT: - selectTool(10); - break; - case ID_LINE: - selectTool(11); - break; - case ID_BEZIER: - selectTool(12); - break; - case ID_RECT: - selectTool(13); - break; - case ID_SHAPE: - selectTool(14); - break; - case ID_ELLIPSE: - selectTool(15); - break; - case ID_RRECT: - selectTool(16); - break; - } - return 0; -} + } + return 0; +} Modified: trunk/reactos/base/applications/mspaint_new/winproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.h [iso-8859-1] Tue Jul 7 11:44:50 2015 @@ -12,7 +12,7 @@ public: DECLARE_WND_CLASS_EX(_T("MainWindow"), CS_DBLCLKS, COLOR_BTNFACE) - BEGIN_MSG_MAP(CPaletteWindow) + BEGIN_MSG_MAP(CMainWindow) MESSAGE_HANDLER(WM_DROPFILES, OnDropFiles) MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_DESTROY, OnDestroy) @@ -38,7 +38,6 @@ LRESULT OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - void selectTool(int tool); void alignChildrenToMainWindow(); void saveImage(BOOL overwrite); void UpdateApplicationProperties(HBITMAP bitmap, LPTSTR newfilename, LPTSTR newfilepathname);

9 years, 4 months

[gedmurphy] 68369: [DEVMGR] I know this *_new thing is a bit overused, but there are a lot of changes coming to devmgr and rather than take it out of the build for a few days, it's easier to do it ...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jul 7 11:43:15 2015 New Revision: 68369 URL: http://svn.reactos.org/svn/reactos?rev=68369&view=rev Log: [DEVMGR] I know this *_new thing is a bit overused, but there are a lot of changes coming to devmgr and rather than take it out of the build for a few days, it's easier to do it this way Added: trunk/reactos/dll/win32/devmgr_new/ (with props) trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/CMakeLists.txt trunk/reactos/dll/win32/devmgr_new/advprop.c - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr_new/devmgmt/ - copied from r68368, trunk/reactos/dll/win32/devmgr/devmgmt/ trunk/reactos/dll/win32/devmgr_new/devmgr.rc - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/devmgr_new/devmgr.spec - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/devmgr.spec trunk/reactos/dll/win32/devmgr_new/devprblm.c - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/devprblm.c trunk/reactos/dll/win32/devmgr_new/hwpage.c - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/hwpage.c trunk/reactos/dll/win32/devmgr_new/hwresource.c - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/hwresource.c trunk/reactos/dll/win32/devmgr_new/lang/ - copied from r68368, trunk/reactos/dll/win32/devmgr/lang/ trunk/reactos/dll/win32/devmgr_new/misc.c - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/misc.c trunk/reactos/dll/win32/devmgr_new/precomp.h - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/precomp.h trunk/reactos/dll/win32/devmgr_new/resource.h - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/resource.h trunk/reactos/dll/win32/devmgr_new/resources/ - copied from r68368, trunk/reactos/dll/win32/devmgr/resources/ trunk/reactos/dll/win32/devmgr_new/stubs.c - copied unchanged from r68368, trunk/reactos/dll/win32/devmgr/stubs.c Propchange: trunk/reactos/dll/win32/devmgr_new/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jul 7 11:43:15 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/devmgr_new/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/devmgr_new/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/win32/devmgr_new/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

9 years, 4 months

[bfreisen] 68368: [MSPAINT_NEW] manage palette and tools data in a PaletteModel and ToolsModel class, respectively; fix tiny bug in mouse.cpp (third batch of git commits)

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Tue Jul 7 11:15:24 2015 New Revision: 68368 URL: http://svn.reactos.org/svn/reactos?rev=68368&view=rev Log: [MSPAINT_NEW] manage palette and tools data in a PaletteModel and ToolsModel class, respectively; fix tiny bug in mouse.cpp (third batch of git commits) Added: trunk/reactos/base/applications/mspaint_new/palettemodel.cpp (with props) trunk/reactos/base/applications/mspaint_new/palettemodel.h (with props) trunk/reactos/base/applications/mspaint_new/toolsmodel.cpp (with props) trunk/reactos/base/applications/mspaint_new/toolsmodel.h (with props) Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/history.cpp trunk/reactos/base/applications/mspaint_new/imgarea.cpp trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/mouse.cpp trunk/reactos/base/applications/mspaint_new/palette.cpp trunk/reactos/base/applications/mspaint_new/precomp.h trunk/reactos/base/applications/mspaint_new/scrollbox.cpp trunk/reactos/base/applications/mspaint_new/selection.cpp trunk/reactos/base/applications/mspaint_new/sizebox.cpp trunk/reactos/base/applications/mspaint_new/toolsettings.cpp trunk/reactos/base/applications/mspaint_new/winproc.cpp Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -14,12 +14,14 @@ miniature.cpp mouse.cpp palette.cpp + palettemodel.cpp registry.cpp scrollbox.cpp selection.cpp sizebox.cpp textedit.cpp toolsettings.cpp + toolsmodel.cpp winproc.cpp precomp.h) Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -40,14 +40,10 @@ extern POINT start; extern POINT last; -extern int lineWidth; -extern int shapeStyle; -extern int brushStyle; -extern int activeTool; -extern int airBrushWidth; -extern int rubberRadius; -extern int transpBg; -extern int zoom; + +class ToolsModel; +extern ToolsModel toolsModel; + extern RECT rectSel_src; extern RECT rectSel_dest; extern HBITMAP hSelBm; @@ -58,13 +54,8 @@ extern LPTSTR textToolText; extern int textToolTextMaxLen; -extern int palColors[28]; -extern int modernPalColors[28]; -extern int oldPalColors[28]; -extern int selectedPalette; - -extern int fgColor; -extern int bgColor; +class PaletteModel; +extern PaletteModel paletteModel; extern HWND hStatusBar; extern HWND hTrackbarZoom; Modified: trunk/reactos/base/applications/mspaint_new/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -119,8 +119,8 @@ hdc = CreateCompatibleDC(hDrawingDC); SelectObject(hdc, hBms[currInd]); - oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, bgColor)); - oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(bgColor)); + oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, paletteModel.GetBgColor())); + oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(paletteModel.GetBgColor())); Rectangle(hdc, 0, 0, width, height); BitBlt(hdc, -xOffset, -yOffset, imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); DeleteObject(SelectObject(hdc, oldBrush)); Modified: trunk/reactos/base/applications/mspaint_new/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -55,26 +55,26 @@ 0, 0, 3, 3, TRUE); sizeboxCenterTop.MoveWindow( - imgXRes * zoom / 2000 + 3 * 3 / 4, + imgXRes * toolsModel.GetZoom() / 2000 + 3 * 3 / 4, 0, 3, 3, TRUE); sizeboxRightTop.MoveWindow( - imgXRes * zoom / 1000 + 3, + imgXRes * toolsModel.GetZoom() / 1000 + 3, 0, 3, 3, TRUE); sizeboxLeftCenter.MoveWindow( 0, - imgYRes * zoom / 2000 + 3 * 3 / 4, 3, 3, TRUE); + imgYRes * toolsModel.GetZoom() / 2000 + 3 * 3 / 4, 3, 3, TRUE); sizeboxRightCenter.MoveWindow( - imgXRes * zoom / 1000 + 3, - imgYRes * zoom / 2000 + 3 * 3 / 4, 3, 3, TRUE); + imgXRes * toolsModel.GetZoom() / 1000 + 3, + imgYRes * toolsModel.GetZoom() / 2000 + 3 * 3 / 4, 3, 3, TRUE); sizeboxLeftBottom.MoveWindow( 0, - imgYRes * zoom / 1000 + 3, 3, 3, TRUE); + imgYRes * toolsModel.GetZoom() / 1000 + 3, 3, 3, TRUE); sizeboxCenterBottom.MoveWindow( - imgXRes * zoom / 2000 + 3 * 3 / 4, - imgYRes * zoom / 1000 + 3, 3, 3, TRUE); + imgXRes * toolsModel.GetZoom() / 2000 + 3 * 3 / 4, + imgYRes * toolsModel.GetZoom() / 1000 + 3, 3, 3, TRUE); sizeboxRightBottom.MoveWindow( - imgXRes * zoom / 1000 + 3, - imgYRes * zoom / 1000 + 3, 3, 3, TRUE); + imgXRes * toolsModel.GetZoom() / 1000 + 3, + imgYRes * toolsModel.GetZoom() / 1000 + 3, 3, 3, TRUE); UpdateScrollbox(); return 0; } @@ -83,21 +83,21 @@ { DefWindowProc(WM_PAINT, wParam, lParam); HDC hdc = imageArea.GetDC(); - StretchBlt(hdc, 0, 0, imgXRes * zoom / 1000, imgYRes * zoom / 1000, hDrawingDC, 0, 0, imgXRes, + StretchBlt(hdc, 0, 0, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, hDrawingDC, 0, 0, imgXRes, imgYRes, SRCCOPY); - if (showGrid && (zoom >= 4000)) + if (showGrid && (toolsModel.GetZoom() >= 4000)) { HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, 0x00a0a0a0)); int counter; for(counter = 0; counter <= imgYRes; counter++) { - MoveToEx(hdc, 0, counter * zoom / 1000, NULL); - LineTo(hdc, imgXRes * zoom / 1000, counter * zoom / 1000); + MoveToEx(hdc, 0, counter * toolsModel.GetZoom() / 1000, NULL); + LineTo(hdc, imgXRes * toolsModel.GetZoom() / 1000, counter * toolsModel.GetZoom() / 1000); } for(counter = 0; counter <= imgXRes; counter++) { - MoveToEx(hdc, counter * zoom / 1000, 0, NULL); - LineTo(hdc, counter * zoom / 1000, imgYRes * zoom / 1000); + MoveToEx(hdc, counter * toolsModel.GetZoom() / 1000, 0, NULL); + LineTo(hdc, counter * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000); } DeleteObject(SelectObject(hdc, oldPen)); } @@ -109,7 +109,7 @@ LRESULT CImgAreaWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - switch (activeTool) + switch (toolsModel.GetActiveTool()) { case TOOL_FILL: SetCursor(hCurFill); @@ -134,12 +134,12 @@ LRESULT CImgAreaWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if ((!drawing) || (activeTool == TOOL_COLOR)) + if ((!drawing) || (toolsModel.GetActiveTool() == TOOL_COLOR)) { SetCapture(); drawing = TRUE; - startPaintingL(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, - fgColor, bgColor); + startPaintingL(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), + paletteModel.GetFgColor(), paletteModel.GetBgColor()); } else { @@ -147,19 +147,19 @@ undo(); } Invalidate(FALSE); - if ((activeTool == TOOL_ZOOM) && (zoom < 8000)) - zoomTo(zoom * 2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + if ((toolsModel.GetActiveTool() == TOOL_ZOOM) && (toolsModel.GetZoom() < 8000)) + zoomTo(toolsModel.GetZoom() * 2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); return 0; } LRESULT CImgAreaWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if ((!drawing) || (activeTool == TOOL_COLOR)) + if ((!drawing) || (toolsModel.GetActiveTool() == TOOL_COLOR)) { SetCapture(); drawing = TRUE; - startPaintingR(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, - fgColor, bgColor); + startPaintingR(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), + paletteModel.GetFgColor(), paletteModel.GetBgColor()); } else { @@ -167,8 +167,8 @@ undo(); } Invalidate(FALSE); - if ((activeTool == TOOL_ZOOM) && (zoom > 125)) - zoomTo(zoom / 2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + if ((toolsModel.GetActiveTool() == TOOL_ZOOM) && (toolsModel.GetZoom() > 125)) + zoomTo(toolsModel.GetZoom() / 2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); return 0; } @@ -178,15 +178,15 @@ { ReleaseCapture(); drawing = FALSE; - endPaintingL(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, fgColor, - bgColor); + endPaintingL(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), + paletteModel.GetBgColor()); Invalidate(FALSE); - if (activeTool == TOOL_COLOR) + if (toolsModel.GetActiveTool() == TOOL_COLOR) { COLORREF tempColor = - GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom); + GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom()); if (tempColor != CLR_INVALID) - fgColor = tempColor; + paletteModel.SetFgColor(tempColor); paletteWindow.Invalidate(FALSE); } SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); @@ -200,15 +200,15 @@ { ReleaseCapture(); drawing = FALSE; - endPaintingR(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, fgColor, - bgColor); + endPaintingR(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), + paletteModel.GetBgColor()); Invalidate(FALSE); - if (activeTool == TOOL_COLOR) + if (toolsModel.GetActiveTool() == TOOL_COLOR) { COLORREF tempColor = - GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom); + GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom()); if (tempColor != CLR_INVALID) - bgColor = tempColor; + paletteModel.SetBgColor(tempColor); paletteWindow.Invalidate(FALSE); } SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); @@ -218,13 +218,13 @@ LRESULT CImgAreaWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - LONG xNow = GET_X_LPARAM(lParam) * 1000 / zoom; - LONG yNow = GET_Y_LPARAM(lParam) * 1000 / zoom; - if ((!drawing) || (activeTool <= TOOL_AIRBRUSH)) + LONG xNow = GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(); + LONG yNow = GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(); + if ((!drawing) || (toolsModel.GetActiveTool() <= TOOL_AIRBRUSH)) { TRACKMOUSEEVENT tme; - if (activeTool == TOOL_ZOOM) + if (toolsModel.GetActiveTool() == TOOL_ZOOM) { Invalidate(FALSE); UpdateWindow(); @@ -250,7 +250,7 @@ LONG xRel = xNow - start.x; LONG yRel = yNow - start.y; /* freesel, rectsel and text tools always show numbers limited to fit into image area */ - if ((activeTool == TOOL_FREESEL) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_TEXT)) + if ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_TEXT)) { if (xRel < 0) xRel = (xNow < 0) ? -start.x : xRel; @@ -262,7 +262,7 @@ yRel = imgYRes-start.y; } /* rectsel and shape tools always show non-negative numbers when drawing */ - if ((activeTool == TOOL_RECTSEL) || (activeTool == TOOL_SHAPE)) + if ((toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_SHAPE)) { if (xRel < 0) xRel = -xRel; @@ -270,7 +270,7 @@ yRel = -yRel; } /* while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 */ - switch(activeTool) + switch(toolsModel.GetActiveTool()) { case TOOL_RUBBER: case TOOL_PEN: @@ -286,12 +286,12 @@ } if ((wParam & MK_LBUTTON) != 0) { - whilePaintingL(hDrawingDC, xNow, yNow, fgColor, bgColor); + whilePaintingL(hDrawingDC, xNow, yNow, paletteModel.GetFgColor(), paletteModel.GetBgColor()); Invalidate(FALSE); - if ((activeTool >= TOOL_TEXT) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_FREESEL)) + if ((toolsModel.GetActiveTool() >= TOOL_TEXT) || (toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_FREESEL)) { TCHAR sizeStr[100]; - if ((activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + if ((toolsModel.GetActiveTool() >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) yRel = xRel; _stprintf(sizeStr, _T("%ld x %ld"), xRel, yRel); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); @@ -299,12 +299,12 @@ } if ((wParam & MK_RBUTTON) != 0) { - whilePaintingR(hDrawingDC, xNow, yNow, fgColor, bgColor); + whilePaintingR(hDrawingDC, xNow, yNow, paletteModel.GetFgColor(), paletteModel.GetBgColor()); Invalidate(FALSE); - if (activeTool >= TOOL_TEXT) + if (toolsModel.GetActiveTool() >= TOOL_TEXT) { TCHAR sizeStr[100]; - if ((activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + if ((toolsModel.GetActiveTool() >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) yRel = xRel; _stprintf(sizeStr, _T("%ld x %ld"), xRel, yRel); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); @@ -317,7 +317,7 @@ LRESULT CImgAreaWindow::OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) _T("")); - if (activeTool == TOOL_ZOOM) + if (toolsModel.GetActiveTool() == TOOL_ZOOM) imageArea.Invalidate(FALSE); return 0; } Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -32,14 +32,9 @@ POINT start; POINT last; -int lineWidth = 1; -int shapeStyle = 0; -int brushStyle = 0; -int activeTool = TOOL_PEN; -int airBrushWidth = 5; -int rubberRadius = 4; -int transpBg = 0; -int zoom = 1000; + +ToolsModel toolsModel; + RECT rectSel_src; RECT rectSel_dest; HBITMAP hSelBm; @@ -50,29 +45,7 @@ LPTSTR textToolText = NULL; int textToolTextMaxLen = 0; -/* array holding palette colors; may be changed by the user during execution */ -int palColors[28]; - -/* modern palette */ -int modernPalColors[28] = { 0x000000, 0x464646, 0x787878, 0x300099, 0x241ced, 0x0078ff, 0x0ec2ff, - 0x00f2ff, 0x1de6a8, 0x4cb122, 0xefb700, 0xf36d4d, 0x99362f, 0x98316f, - 0xffffff, 0xdcdcdc, 0xb4b4b4, 0x3c5a9c, 0xb1a3ff, 0x7aaae5, 0x9ce4f5, - 0xbdf9ff, 0xbcf9d3, 0x61bb9d, 0xead999, 0xd19a70, 0x8e6d54, 0xd5a5b5 -}; - -/* older palette containing VGA colors */ -int oldPalColors[28] = { 0x000000, 0x808080, 0x000080, 0x008080, 0x008000, 0x808000, 0x800000, - 0x800080, 0x408080, 0x404000, 0xff8000, 0x804000, 0xff0040, 0x004080, - 0xffffff, 0xc0c0c0, 0x0000ff, 0x00ffff, 0x00ff00, 0xffff00, 0xff0000, - 0xff00ff, 0x80ffff, 0x80ff00, 0xffff80, 0xff8080, 0x8000ff, 0x4080ff -}; - -/* palette currently in use (1: modern, 2: old) */ -int selectedPalette; - -/* foreground and background colors with initial value */ -int fgColor = 0x00000000; -int bgColor = 0x00ffffff; +PaletteModel paletteModel; HWND hStatusBar; HWND hTrackbarZoom; @@ -170,10 +143,6 @@ lstrcpy(lfTextFont.lfFaceName, _T("")); hfontTextFont = CreateFontIndirect(&lfTextFont); - /* init palette */ - selectedPalette = 1; - CopyMemory(palColors, modernPalColors, sizeof(palColors)); - hProgInstance = hThisInstance; /* initialize common controls library */ @@ -293,8 +262,8 @@ hDrawingDC = CreateCompatibleDC(hDC); hSelDC = CreateCompatibleDC(hDC); imageArea.ReleaseDC(hDC); - SelectObject(hDrawingDC, CreatePen(PS_SOLID, 0, fgColor)); - SelectObject(hDrawingDC, CreateSolidBrush(bgColor)); + SelectObject(hDrawingDC, CreatePen(PS_SOLID, 0, paletteModel.GetFgColor())); + SelectObject(hDrawingDC, CreateSolidBrush(paletteModel.GetBgColor())); hBms[0] = CreateDIBWithProperties(imgXRes, imgYRes); SelectObject(hDrawingDC, hBms[0]); Modified: trunk/reactos/base/applications/mspaint_new/mouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/mouse.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/mouse.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -15,8 +15,8 @@ void placeSelWin() { - selectionWindow.MoveWindow(rectSel_dest.left * zoom / 1000, rectSel_dest.top * zoom / 1000, - RECT_WIDTH(rectSel_dest) * zoom / 1000 + 6, RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 6, TRUE); + selectionWindow.MoveWindow(rectSel_dest.left * toolsModel.GetZoom() / 1000, rectSel_dest.top * toolsModel.GetZoom() / 1000, + RECT_WIDTH(rectSel_dest) * toolsModel.GetZoom() / 1000 + 6, RECT_HEIGHT(rectSel_dest) * toolsModel.GetZoom() / 1000 + 6, TRUE); selectionWindow.BringWindowToTop(); imageArea.InvalidateRect(NULL, FALSE); } @@ -61,7 +61,7 @@ start.y = y; last.x = x; last.y = y; - switch (activeTool) + switch (toolsModel.GetActiveTool()) { case TOOL_FREESEL: selectionWindow.ShowWindow(SW_HIDE); @@ -87,7 +87,7 @@ break; case TOOL_RUBBER: newReversible(); - Erase(hdc, x, y, x, y, bg, rubberRadius); + Erase(hdc, x, y, x, y, bg, toolsModel.GetRubberRadius()); break; case TOOL_FILL: newReversible(); @@ -99,11 +99,11 @@ break; case TOOL_BRUSH: newReversible(); - Brush(hdc, x, y, x, y, fg, brushStyle); + Brush(hdc, x, y, x, y, fg, toolsModel.GetBrushStyle()); break; case TOOL_AIRBRUSH: newReversible(); - Airbrush(hdc, x, y, fg, airBrushWidth); + Airbrush(hdc, x, y, fg, toolsModel.GetAirBrushWidth()); break; case TOOL_BEZIER: pointStack[pointSP].x = x; @@ -118,7 +118,7 @@ pointStack[pointSP].x = x; pointStack[pointSP].y = y; if (pointSP + 1 >= 2) - Poly(hdc, pointStack, pointSP + 1, fg, bg, lineWidth, shapeStyle, FALSE, FALSE); + Poly(hdc, pointStack, pointSP + 1, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); if (pointSP == 0) { newReversible(); @@ -131,7 +131,7 @@ void whilePaintingL(HDC hdc, LONG x, LONG y, COLORREF fg, COLORREF bg) { - switch (activeTool) + switch (toolsModel.GetActiveTool()) { case TOOL_FREESEL: if (ptSP == 0) @@ -159,22 +159,22 @@ break; } case TOOL_RUBBER: - Erase(hdc, last.x, last.y, x, y, bg, rubberRadius); + Erase(hdc, last.x, last.y, x, y, bg, toolsModel.GetRubberRadius()); break; case TOOL_PEN: Line(hdc, last.x, last.y, x, y, fg, 1); break; case TOOL_BRUSH: - Brush(hdc, last.x, last.y, x, y, fg, brushStyle); + Brush(hdc, last.x, last.y, x, y, fg, toolsModel.GetBrushStyle()); break; case TOOL_AIRBRUSH: - Airbrush(hdc, x, y, fg, airBrushWidth); + Airbrush(hdc, x, y, fg, toolsModel.GetAirBrushWidth()); break; case TOOL_LINE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); - Line(hdc, start.x, start.y, x, y, fg, lineWidth); + Line(hdc, start.x, start.y, x, y, fg, toolsModel.GetLineWidth()); break; case TOOL_BEZIER: resetToU1(); @@ -184,13 +184,13 @@ { case 1: Line(hdc, pointStack[0].x, pointStack[0].y, pointStack[1].x, pointStack[1].y, fg, - lineWidth); + toolsModel.GetLineWidth()); break; case 2: - Bezier(hdc, pointStack[0], pointStack[2], pointStack[2], pointStack[1], fg, lineWidth); + Bezier(hdc, pointStack[0], pointStack[2], pointStack[2], pointStack[1], fg, toolsModel.GetLineWidth()); break; case 3: - Bezier(hdc, pointStack[0], pointStack[2], pointStack[3], pointStack[1], fg, lineWidth); + Bezier(hdc, pointStack[0], pointStack[2], pointStack[3], pointStack[1], fg, toolsModel.GetLineWidth()); break; } break; @@ -198,7 +198,7 @@ resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - Rect(hdc, start.x, start.y, x, y, fg, bg, lineWidth, shapeStyle); + Rect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: resetToU1(); @@ -208,19 +208,19 @@ roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, &pointStack[pointSP].x, &pointStack[pointSP].y); if (pointSP + 1 >= 2) - Poly(hdc, pointStack, pointSP + 1, fg, bg, lineWidth, shapeStyle, FALSE, FALSE); + Poly(hdc, pointStack, pointSP + 1, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); break; case TOOL_ELLIPSE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - Ellp(hdc, start.x, start.y, x, y, fg, bg, lineWidth, shapeStyle); + Ellp(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - RRect(hdc, start.x, start.y, x, y, fg, bg, lineWidth, shapeStyle); + RRect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; } @@ -231,7 +231,7 @@ void endPaintingL(HDC hdc, LONG x, LONG y, COLORREF fg, COLORREF bg) { - switch (activeTool) + switch (toolsModel.GetActiveTool()) { case TOOL_FREESEL: { @@ -303,7 +303,7 @@ BitBlt(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hDrawingDC, rectSel_src.left, rectSel_src.top, SRCCOPY); Rect(hdc, rectSel_src.left, rectSel_src.top, rectSel_src.right, - rectSel_src.bottom, bgColor, bgColor, 0, TRUE); + rectSel_src.bottom, bg, bg, 0, TRUE); newReversible(); BitBlt(hDrawingDC, rectSel_src.left, rectSel_src.top, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hSelDC, 0, @@ -326,7 +326,7 @@ } break; case TOOL_RUBBER: - Erase(hdc, last.x, last.y, x, y, bg, rubberRadius); + Erase(hdc, last.x, last.y, x, y, bg, toolsModel.GetRubberRadius()); break; case TOOL_PEN: Line(hdc, last.x, last.y, x, y, fg, 1); @@ -336,7 +336,7 @@ resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); - Line(hdc, start.x, start.y, x, y, fg, lineWidth); + Line(hdc, start.x, start.y, x, y, fg, toolsModel.GetLineWidth()); break; case TOOL_BEZIER: pointSP++; @@ -347,7 +347,7 @@ resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - Rect(hdc, start.x, start.y, x, y, fg, bg, lineWidth, shapeStyle); + Rect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: resetToU1(); @@ -360,14 +360,14 @@ if (pointSP >= 2) { if ((pointStack[0].x - x) * (pointStack[0].x - x) + - (pointStack[0].y - y) * (pointStack[0].y - y) <= lineWidth * lineWidth + 1) + (pointStack[0].y - y) * (pointStack[0].y - y) <= toolsModel.GetLineWidth() * toolsModel.GetLineWidth() + 1) { - Poly(hdc, pointStack, pointSP, fg, bg, lineWidth, shapeStyle, TRUE, FALSE); + Poly(hdc, pointStack, pointSP, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), TRUE, FALSE); pointSP = 0; } else { - Poly(hdc, pointStack, pointSP, fg, bg, lineWidth, shapeStyle, FALSE, FALSE); + Poly(hdc, pointStack, pointSP, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); } } if (pointSP == 255) @@ -377,13 +377,13 @@ resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - Ellp(hdc, start.x, start.y, x, y, fg, bg, lineWidth, shapeStyle); + Ellp(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - RRect(hdc, start.x, start.y, x, y, fg, bg, lineWidth, shapeStyle); + RRect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; } } @@ -395,7 +395,7 @@ start.y = y; last.x = x; last.y = y; - switch (activeTool) + switch (toolsModel.GetActiveTool()) { case TOOL_FREESEL: case TOOL_TEXT: @@ -407,7 +407,7 @@ break; case TOOL_RUBBER: newReversible(); - Replace(hdc, x, y, x, y, fg, bg, rubberRadius); + Replace(hdc, x, y, x, y, fg, bg, toolsModel.GetRubberRadius()); break; case TOOL_FILL: newReversible(); @@ -419,11 +419,11 @@ break; case TOOL_BRUSH: newReversible(); - Brush(hdc, x, y, x, y, bg, brushStyle); + Brush(hdc, x, y, x, y, bg, toolsModel.GetBrushStyle()); break; case TOOL_AIRBRUSH: newReversible(); - Airbrush(hdc, x, y, bg, airBrushWidth); + Airbrush(hdc, x, y, bg, toolsModel.GetAirBrushWidth()); break; case TOOL_BEZIER: pointStack[pointSP].x = x; @@ -438,7 +438,7 @@ pointStack[pointSP].x = x; pointStack[pointSP].y = y; if (pointSP + 1 >= 2) - Poly(hdc, pointStack, pointSP + 1, bg, fg, lineWidth, shapeStyle, FALSE, FALSE); + Poly(hdc, pointStack, pointSP + 1, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); if (pointSP == 0) { newReversible(); @@ -451,25 +451,25 @@ void whilePaintingR(HDC hdc, LONG x, LONG y, COLORREF fg, COLORREF bg) { - switch (activeTool) + switch (toolsModel.GetActiveTool()) { case TOOL_RUBBER: - Replace(hdc, last.x, last.y, x, y, fg, bg, rubberRadius); + Replace(hdc, last.x, last.y, x, y, fg, bg, toolsModel.GetRubberRadius()); break; case TOOL_PEN: Line(hdc, last.x, last.y, x, y, bg, 1); break; case TOOL_BRUSH: - Brush(hdc, last.x, last.y, x, y, bg, brushStyle); + Brush(hdc, last.x, last.y, x, y, bg, toolsModel.GetBrushStyle()); break; case TOOL_AIRBRUSH: - Airbrush(hdc, x, y, bg, airBrushWidth); + Airbrush(hdc, x, y, bg, toolsModel.GetAirBrushWidth()); break; case TOOL_LINE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); - Line(hdc, start.x, start.y, x, y, bg, lineWidth); + Line(hdc, start.x, start.y, x, y, bg, toolsModel.GetLineWidth()); break; case TOOL_BEZIER: resetToU1(); @@ -479,13 +479,13 @@ { case 1: Line(hdc, pointStack[0].x, pointStack[0].y, pointStack[1].x, pointStack[1].y, bg, - lineWidth); + toolsModel.GetLineWidth()); break; case 2: - Bezier(hdc, pointStack[0], pointStack[2], pointStack[2], pointStack[1], bg, lineWidth); + Bezier(hdc, pointStack[0], pointStack[2], pointStack[2], pointStack[1], bg, toolsModel.GetLineWidth()); break; case 3: - Bezier(hdc, pointStack[0], pointStack[2], pointStack[3], pointStack[1], bg, lineWidth); + Bezier(hdc, pointStack[0], pointStack[2], pointStack[3], pointStack[1], bg, toolsModel.GetLineWidth()); break; } break; @@ -493,7 +493,7 @@ resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - Rect(hdc, start.x, start.y, x, y, bg, fg, lineWidth, shapeStyle); + Rect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: resetToU1(); @@ -503,19 +503,19 @@ roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, &pointStack[pointSP].x, &pointStack[pointSP].y); if (pointSP + 1 >= 2) - Poly(hdc, pointStack, pointSP + 1, bg, fg, lineWidth, shapeStyle, FALSE, FALSE); + Poly(hdc, pointStack, pointSP + 1, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); break; case TOOL_ELLIPSE: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - Ellp(hdc, start.x, start.y, x, y, bg, fg, lineWidth, shapeStyle); + Ellp(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - RRect(hdc, start.x, start.y, x, y, bg, fg, lineWidth, shapeStyle); + RRect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; } @@ -526,10 +526,10 @@ void endPaintingR(HDC hdc, LONG x, LONG y, COLORREF fg, COLORREF bg) { - switch (activeTool) + switch (toolsModel.GetActiveTool()) { case TOOL_RUBBER: - Replace(hdc, last.x, last.y, x, y, fg, bg, rubberRadius); + Replace(hdc, last.x, last.y, x, y, fg, bg, toolsModel.GetRubberRadius()); break; case TOOL_PEN: Line(hdc, last.x, last.y, x, y, bg, 1); @@ -539,7 +539,7 @@ resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); - Line(hdc, start.x, start.y, x, y, bg, lineWidth); + Line(hdc, start.x, start.y, x, y, bg, toolsModel.GetLineWidth()); break; case TOOL_BEZIER: pointSP++; @@ -550,7 +550,7 @@ resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - Rect(hdc, start.x, start.y, x, y, bg, fg, lineWidth, shapeStyle); + Rect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: resetToU1(); @@ -563,14 +563,14 @@ if (pointSP >= 2) { if ((pointStack[0].x - x) * (pointStack[0].x - x) + - (pointStack[0].y - y) * (pointStack[0].y - y) <= lineWidth * lineWidth + 1) + (pointStack[0].y - y) * (pointStack[0].y - y) <= toolsModel.GetLineWidth() * toolsModel.GetLineWidth() + 1) { - Poly(hdc, pointStack, pointSP, bg, fg, lineWidth, shapeStyle, TRUE, FALSE); + Poly(hdc, pointStack, pointSP, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), TRUE, FALSE); pointSP = 0; } else { - Poly(hdc, pointStack, pointSP, bg, fg, lineWidth, shapeStyle, FALSE, FALSE); + Poly(hdc, pointStack, pointSP, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); } } if (pointSP == 255) @@ -580,13 +580,13 @@ resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - Ellp(hdc, start.x, start.y, x, y, bg, fg, lineWidth, shapeStyle); + Ellp(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: resetToU1(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); - RRect(hdc, start.x, start.y, x, y, bg, fg, lineWidth, shapeStyle); - break; - } -} + RRect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); + break; + } +} Modified: trunk/reactos/base/applications/mspaint_new/palette.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/palette.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/palette.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -32,12 +32,12 @@ SetRect(&rc, 11, 12, 26, 27); DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE); oldPen = (HPEN) SelectObject(hDC, CreatePen(PS_NULL, 0, 0)); - oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(bgColor)); + oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(paletteModel.GetBgColor())); Rectangle(hDC, rc.left, rc.top + 2, rc.right - 1, rc.bottom - 1); DeleteObject(SelectObject(hDC, oldBrush)); SetRect(&rc, 4, 5, 19, 20); DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE); - oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(fgColor)); + oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(paletteModel.GetFgColor())); Rectangle(hDC, rc.left + 2, rc.top + 2, rc.right - 1, rc.bottom - 1); DeleteObject(SelectObject(hDC, oldBrush)); DeleteObject(SelectObject(hDC, oldPen)); @@ -49,7 +49,7 @@ DrawEdge(hDC, &rc, EDGE_RAISED, BF_TOPLEFT); DrawEdge(hDC, &rc, BDR_SUNKENOUTER, BF_RECT); oldPen = (HPEN) SelectObject(hDC, CreatePen(PS_NULL, 0, 0)); - oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(palColors[i])); + oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(paletteModel.GetColor(i))); Rectangle(hDC, rc.left + 2, rc.top + 2, rc.right - 1, rc.bottom - 1); DeleteObject(SelectObject(hDC, oldBrush)); DeleteObject(SelectObject(hDC, oldPen)); @@ -62,9 +62,9 @@ { if (GET_X_LPARAM(lParam) >= 31) { - fgColor = palColors[(GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14]; + paletteModel.SetFgColor(paletteModel.GetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14)); InvalidateRect(NULL, FALSE); - if (activeTool == 10) + if (toolsModel.GetActiveTool() == 10) ForceRefreshSelectionContents(); } return 0; @@ -74,9 +74,9 @@ { if (GET_X_LPARAM(lParam) >= 31) { - bgColor = palColors[(GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14]; + paletteModel.SetBgColor(paletteModel.GetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14)); InvalidateRect(NULL, FALSE); - if (activeTool == 10) + if (toolsModel.GetActiveTool() == 10) ForceRefreshSelectionContents(); } return 0; @@ -87,11 +87,11 @@ if (GET_X_LPARAM(lParam) >= 31) if (ChooseColor(&choosecolor)) { - palColors[(GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14] = - choosecolor.rgbResult; - fgColor = choosecolor.rgbResult; + paletteModel.SetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14, + choosecolor.rgbResult); + paletteModel.SetFgColor(choosecolor.rgbResult); InvalidateRect(NULL, FALSE); - if (activeTool == 10) + if (toolsModel.GetActiveTool() == 10) ForceRefreshSelectionContents(); } return 0; @@ -102,11 +102,11 @@ if (GET_X_LPARAM(lParam) >= 31) if (ChooseColor(&choosecolor)) { - palColors[(GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14] = - choosecolor.rgbResult; - bgColor = choosecolor.rgbResult; + paletteModel.SetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14, + choosecolor.rgbResult); + paletteModel.SetBgColor(choosecolor.rgbResult); InvalidateRect(NULL, FALSE); - if (activeTool == 10) + if (toolsModel.GetActiveTool() == 10) ForceRefreshSelectionContents(); } return 0; Added: trunk/reactos/base/applications/mspaint_new/palettemodel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/palettemodel.cpp (added) +++ trunk/reactos/base/applications/mspaint_new/palettemodel.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -0,0 +1,82 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/palettemodel.cpp + * PURPOSE: Keep track of palette data, notify listeners + * PROGRAMMERS: Benedikt Freisen + */ + +/* INCLUDES *********************************************************/ + +#include "precomp.h" + +/* FUNCTIONS ********************************************************/ + +PaletteModel::PaletteModel() +{ + m_fgColor = 0x00000000; + m_bgColor = 0x00ffffff; + SelectPalette(1); +} + +int PaletteModel::SelectedPalette() +{ + return m_nSelectedPalette; +} + +void PaletteModel::SelectPalette(int nPalette) +{ + int modernColors[28] = { + 0x000000, 0x464646, 0x787878, 0x300099, 0x241ced, 0x0078ff, 0x0ec2ff, + 0x00f2ff, 0x1de6a8, 0x4cb122, 0xefb700, 0xf36d4d, 0x99362f, 0x98316f, + 0xffffff, 0xdcdcdc, 0xb4b4b4, 0x3c5a9c, 0xb1a3ff, 0x7aaae5, 0x9ce4f5, + 0xbdf9ff, 0xbcf9d3, 0x61bb9d, 0xead999, 0xd19a70, 0x8e6d54, 0xd5a5b5 + }; + int oldColors[28] = { + 0x000000, 0x808080, 0x000080, 0x008080, 0x008000, 0x808000, 0x800000, + 0x800080, 0x408080, 0x404000, 0xff8000, 0x804000, 0xff0040, 0x004080, + 0xffffff, 0xc0c0c0, 0x0000ff, 0x00ffff, 0x00ff00, 0xffff00, 0xff0000, + 0xff00ff, 0x80ffff, 0x80ff00, 0xffff80, 0xff8080, 0x8000ff, 0x4080ff + }; + if (nPalette == 1) + CopyMemory(m_colors, modernColors, sizeof(m_colors)); + else if (nPalette == 2) + CopyMemory(m_colors, oldColors, sizeof(m_colors)); + else + return; + m_nSelectedPalette = nPalette; +} + +int PaletteModel::GetColor(int nIndex) +{ + if (nIndex < 28) + return m_colors[nIndex]; + else + return 0; +} + +void PaletteModel::SetColor(int nIndex, int newColor) +{ + if (nIndex < 28) + m_colors[nIndex] = newColor; +} + +int PaletteModel::GetFgColor() +{ + return m_fgColor; +} + +void PaletteModel::SetFgColor(int newColor) +{ + m_fgColor = newColor; +} + +int PaletteModel::GetBgColor() +{ + return m_bgColor; +} + +void PaletteModel::SetBgColor(int newColor) +{ + m_bgColor = newColor; +} Propchange: trunk/reactos/base/applications/mspaint_new/palettemodel.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mspaint_new/palettemodel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/palettemodel.h (added) +++ trunk/reactos/base/applications/mspaint_new/palettemodel.h [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -0,0 +1,28 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/palettemodel.h + * PURPOSE: Keep track of palette data, notify listeners + * PROGRAMMERS: Benedikt Freisen + */ + +/* CLASSES **********************************************************/ + +class PaletteModel +{ +private: + int m_colors[28]; + int m_nSelectedPalette; + int m_fgColor; + int m_bgColor; +public: + PaletteModel(); + int SelectedPalette(); + void SelectPalette(int nPalette); + int GetColor(int nIndex); + void SetColor(int nIndex, int newColor); + int GetFgColor(); + void SetFgColor(int newColor); + int GetBgColor(); + void SetBgColor(int newColor); +}; Propchange: trunk/reactos/base/applications/mspaint_new/palettemodel.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mspaint_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -27,11 +27,13 @@ #include "miniature.h" #include "mouse.h" #include "palette.h" +#include "palettemodel.h" #include "scrollbox.h" #include "selection.h" #include "sizebox.h" #include "textedit.h" #include "toolsettings.h" +#include "toolsmodel.h" #include "winproc.h" #endif /* _MSPAINT_H */ Modified: trunk/reactos/base/applications/mspaint_new/scrollbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/scrollbox.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/scrollbox.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -74,8 +74,8 @@ } scrollboxWindow.SetScrollInfo(SB_HORZ, &si); scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), imgXRes * zoom / 1000 + 6, - imgYRes * zoom / 1000 + 6, TRUE); + -scrollboxWindow.GetScrollPos(SB_VERT), imgXRes * toolsModel.GetZoom() / 1000 + 6, + imgYRes * toolsModel.GetZoom() / 1000 + 6, TRUE); } return 0; } @@ -109,8 +109,8 @@ } scrollboxWindow.SetScrollInfo(SB_VERT, &si); scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), imgXRes * zoom / 1000 + 6, - imgYRes * zoom / 1000 + 6, TRUE); + -scrollboxWindow.GetScrollPos(SB_VERT), imgXRes * toolsModel.GetZoom() / 1000 + 6, + imgYRes * toolsModel.GetZoom() / 1000 + 6, TRUE); } return 0; } Modified: trunk/reactos/base/applications/mspaint_new/selection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/selection.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/selection.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -118,8 +118,8 @@ { HDC hDC = GetDC(); DefWindowProc(WM_PAINT, wParam, lParam); - SelectionFrame(hDC, 1, 1, RECT_WIDTH(rectSel_dest) * zoom / 1000 + 5, - RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 5, + SelectionFrame(hDC, 1, 1, RECT_WIDTH(rectSel_dest) * toolsModel.GetZoom() / 1000 + 5, + RECT_HEIGHT(rectSel_dest) * toolsModel.GetZoom() / 1000 + 5, system_selection_color); ReleaseDC(hDC); } @@ -178,17 +178,17 @@ resetToU1(); frac.x += GET_X_LPARAM(lParam) - pos.x; frac.y += GET_Y_LPARAM(lParam) - pos.y; - delta.x += frac.x * 1000 / zoom; - delta.y += frac.y * 1000 / zoom; - if (zoom < 1000) + delta.x += frac.x * 1000 / toolsModel.GetZoom(); + delta.y += frac.y * 1000 / toolsModel.GetZoom(); + if (toolsModel.GetZoom() < 1000) { frac.x = 0; frac.y = 0; } else { - frac.x -= (frac.x * 1000 / zoom) * zoom / 1000; - frac.y -= (frac.y * 1000 / zoom) * zoom / 1000; + frac.x -= (frac.x * 1000 / toolsModel.GetZoom()) * toolsModel.GetZoom() / 1000; + frac.y -= (frac.y * 1000 / toolsModel.GetZoom()) * toolsModel.GetZoom() / 1000; } switch (action) { @@ -248,22 +248,22 @@ _stprintf(sizeStr, _T("%d x %d"), RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest)); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); - if (activeTool == TOOL_TEXT) - { - Text(hDrawingDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, rectSel_dest.bottom, fgColor, bgColor, textToolText, hfontTextFont, transpBg); + if (toolsModel.GetActiveTool() == TOOL_TEXT) + { + Text(hDrawingDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, rectSel_dest.bottom, paletteModel.GetFgColor(), paletteModel.GetBgColor(), textToolText, hfontTextFont, toolsModel.IsBackgroundTransparent()); } else { if (action != ACTION_MOVE) StretchBlt(hDrawingDC, rectSel_dest.left, rectSel_dest.top, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, 0, 0, GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY); else - if (transpBg == 0) + if (toolsModel.IsBackgroundTransparent() == 0) MaskBlt(hDrawingDC, rectSel_dest.left, rectSel_dest.top, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); else { ColorKeyedMaskBlt(hDrawingDC, rectSel_dest.left, rectSel_dest.top, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), - hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND), bgColor); + hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND), paletteModel.GetBgColor()); } } imageArea.InvalidateRect(NULL, FALSE); @@ -273,8 +273,8 @@ } else { - int w = RECT_WIDTH(rectSel_dest) * zoom / 1000 + 6; - int h = RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 6; + int w = RECT_WIDTH(rectSel_dest) * toolsModel.GetZoom() / 1000 + 6; + int h = RECT_HEIGHT(rectSel_dest) * toolsModel.GetZoom() / 1000 + 6; pos.x = GET_X_LPARAM(lParam); pos.y = GET_Y_LPARAM(lParam); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) NULL); @@ -293,7 +293,7 @@ ReleaseCapture(); if (action != ACTION_MOVE) { - if (activeTool == TOOL_TEXT) + if (toolsModel.GetActiveTool() == TOOL_TEXT) { // FIXME: What to do? } Modified: trunk/reactos/base/applications/mspaint_new/sizebox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/sizebox.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/sizebox.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -45,8 +45,8 @@ TCHAR sizeStr[100]; short xRel; short yRel; - xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / zoom; - yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / zoom; + xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / toolsModel.GetZoom(); + yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / toolsModel.GetZoom(); if (m_hWnd == sizeboxLeftTop.m_hWnd) _stprintf(sizeStr, _T("%d x %d"), imgXRes - xRel, imgYRes - yRel); if (m_hWnd == sizeboxCenterTop.m_hWnd) @@ -76,8 +76,8 @@ short yRel; ReleaseCapture(); resizing = FALSE; - xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / zoom; - yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / zoom; + xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / toolsModel.GetZoom(); + yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / toolsModel.GetZoom(); if (m_hWnd == sizeboxLeftTop) cropReversible(imgXRes - xRel, imgYRes - yRel, xRel, yRel); if (m_hWnd == sizeboxCenterTop.m_hWnd) Modified: trunk/reactos/base/applications/mspaint_new/toolsettings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/toolsettings.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/toolsettings.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -28,9 +28,9 @@ DefWindowProc(WM_PAINT, wParam, lParam); - DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, (activeTool == TOOL_ZOOM) ? BF_RECT : BF_RECT | BF_MIDDLE); - DrawEdge(hdc, &rect2, (activeTool >= TOOL_RECT) ? BDR_SUNKENOUTER : 0, BF_RECT | BF_MIDDLE); - switch (activeTool) + DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, (toolsModel.GetActiveTool() == TOOL_ZOOM) ? BF_RECT : BF_RECT | BF_MIDDLE); + DrawEdge(hdc, &rect2, (toolsModel.GetActiveTool() >= TOOL_RECT) ? BDR_SUNKENOUTER : 0, BF_RECT | BF_MIDDLE); + switch (toolsModel.GetActiveTool()) { case TOOL_FREESEL: case TOOL_RECTSEL: @@ -38,7 +38,7 @@ { HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); - Rectangle(hdc, 2, transpBg * 31 + 2, 41, transpBg * 31 + 33); + Rectangle(hdc, 2, toolsModel.IsBackgroundTransparent() * 31 + 2, 41, toolsModel.IsBackgroundTransparent() * 31 + 33); DeleteObject(SelectObject(hdc, oldPen)); DrawIconEx(hdc, 1, 2, hNontranspIcon, 40, 30, 0, NULL, DI_NORMAL); DrawIconEx(hdc, 1, 33, hTranspIcon, 40, 30, 0, NULL, DI_NORMAL); @@ -50,7 +50,7 @@ HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); for(i = 0; i < 4; i++) { - if (rubberRadius == i + 2) + if (toolsModel.GetRubberRadius() == i + 2) { SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); Rectangle(hdc, 14, i * 15 + 2, 29, i * 15 + 17); @@ -68,19 +68,19 @@ int i; HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); - Rectangle(hdc, brushStyle % 3 * 13 + 2, brushStyle / 3 * 15 + 2, brushStyle % 3 * 13 + 15, - brushStyle / 3 * 15 + 17); + Rectangle(hdc, toolsModel.GetBrushStyle() % 3 * 13 + 2, toolsModel.GetBrushStyle() / 3 * 15 + 2, toolsModel.GetBrushStyle() % 3 * 13 + 15, + toolsModel.GetBrushStyle() / 3 * 15 + 17); DeleteObject(SelectObject(hdc, oldPen)); for(i = 0; i < 12; i++) Brush(hdc, i % 3 * 13 + 7, i / 3 * 15 + 8, i % 3 * 13 + 7, i / 3 * 15 + 8, - GetSysColor((i == brushStyle) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), i); + GetSysColor((i == toolsModel.GetBrushStyle()) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), i); break; } case TOOL_AIRBRUSH: { HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); - switch (airBrushWidth) + switch (toolsModel.GetAirBrushWidth()) { case 5: Rectangle(hdc, 2, 2, 21, 31); @@ -96,13 +96,13 @@ break; } Airbrush(hdc, 10, 15, - GetSysColor((airBrushWidth == 5) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), 5); + GetSysColor((toolsModel.GetAirBrushWidth() == 5) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), 5); Airbrush(hdc, 30, 15, - GetSysColor((airBrushWidth == 8) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), 8); + GetSysColor((toolsModel.GetAirBrushWidth() == 8) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), 8); Airbrush(hdc, 8, 45, - GetSysColor((airBrushWidth == 3) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), 3); + GetSysColor((toolsModel.GetAirBrushWidth() == 3) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), 3); Airbrush(hdc, 27, 45, - GetSysColor((airBrushWidth == 12) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), 12); + GetSysColor((toolsModel.GetAirBrushWidth() == 12) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), 12); DeleteObject(SelectObject(hdc, oldPen)); break; } @@ -113,7 +113,7 @@ HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); for(i = 0; i < 5; i++) { - if (lineWidth == i + 1) + if (toolsModel.GetLineWidth() == i + 1) { SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); Rectangle(hdc, 2, i * 12 + 2, 41, i * 12 + 14); @@ -135,23 +135,23 @@ HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); for(i = 0; i < 3; i++) { - if (shapeStyle == i) + if (toolsModel.GetShapeStyle() == i) { SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); Rectangle(hdc, 2, i * 20 + 2, 41, i * 20 + 22); } } Rect(hdc, 5, 6, 37, 16, - GetSysColor((shapeStyle == 0) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), + GetSysColor((toolsModel.GetShapeStyle() == 0) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), GetSysColor(COLOR_APPWORKSPACE), 1, 0); Rect(hdc, 5, 26, 37, 36, - GetSysColor((shapeStyle == 1) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), + GetSysColor((toolsModel.GetShapeStyle() == 1) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), GetSysColor(COLOR_APPWORKSPACE), 1, 1); Rect(hdc, 5, 46, 37, 56, GetSysColor(COLOR_APPWORKSPACE), GetSysColor(COLOR_APPWORKSPACE), 1, 1); for(i = 0; i < 5; i++) { - if (lineWidth == i + 1) + if (toolsModel.GetLineWidth() == i + 1) { SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); Rectangle(hdc, 2, i * 12 + 72, 41, i * 12 + 84); @@ -173,14 +173,14 @@ { int x = GET_X_LPARAM(lParam); int y = GET_Y_LPARAM(lParam); - switch (activeTool) + switch (toolsModel.GetActiveTool()) { case TOOL_FREESEL: case TOOL_RECTSEL: case TOOL_TEXT: if ((y > 1) && (y < 64)) { - transpBg = (y - 2) / 31; + toolsModel.SetBackgroundTransparent((y - 2) / 31); InvalidateRect(NULL, TRUE); ForceRefreshSelectionContents(); @@ -189,7 +189,7 @@ case TOOL_RUBBER: if ((y > 1) && (y < 62)) { - rubberRadius = (y - 2) / 15 + 2; + toolsModel.SetRubberRadius((y - 2) / 15 + 2); InvalidateRect(NULL, TRUE); } break; @@ -197,7 +197,7 @@ if ((x > 1) && (x < 40) && (y > 1) && (y < 62)) { - brushStyle = (y - 2) / 15 * 3 + (x - 2) / 13; + toolsModel.SetBrushStyle((y - 2) / 15 * 3 + (x - 2) / 13); InvalidateRect(NULL, TRUE); } break; @@ -207,16 +207,16 @@ if (y < 30) { if (x < 20) - airBrushWidth = 5; + toolsModel.SetAirBrushWidth(5); else - airBrushWidth = 8; + toolsModel.SetAirBrushWidth(8); } else { if (x < 15) - airBrushWidth = 3; + toolsModel.SetAirBrushWidth(3); else - airBrushWidth = 12; + toolsModel.SetAirBrushWidth(12); } InvalidateRect(NULL, TRUE); } @@ -225,7 +225,7 @@ case TOOL_BEZIER: if (y <= 62) { - lineWidth = (y - 2) / 12 + 1; + toolsModel.SetLineWidth((y - 2) / 12 + 1); InvalidateRect(NULL, TRUE); } break; @@ -235,12 +235,12 @@ case TOOL_RRECT: if (y <= 60) { - shapeStyle = (y - 2) / 20; + toolsModel.SetShapeStyle((y - 2) / 20); InvalidateRect(NULL, TRUE); } if ((y >= 70) && (y <= 132)) { - lineWidth = (y - 72) / 12 + 1; + toolsModel.SetLineWidth((y - 72) / 12 + 1); InvalidateRect(NULL, TRUE); } break; Added: trunk/reactos/base/applications/mspaint_new/toolsmodel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/toolsmodel.cpp (added) +++ trunk/reactos/base/applications/mspaint_new/toolsmodel.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -0,0 +1,105 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/toolsmodel.cpp + * PURPOSE: Keep track of tool parameters, notify listeners + * PROGRAMMERS: Benedikt Freisen + */ + +/* INCLUDES *********************************************************/ + +#include "precomp.h" + +/* FUNCTIONS ********************************************************/ + +ToolsModel::ToolsModel() +{ + m_lineWidth = 1; + m_shapeStyle = 0; + m_brushStyle = 0; + m_activeTool = TOOL_PEN; + m_airBrushWidth = 5; + m_rubberRadius = 4; + m_transpBg = FALSE; + m_zoom = 1000; +} + +int ToolsModel::GetLineWidth() +{ + return m_lineWidth; +} + +void ToolsModel::SetLineWidth(int nLineWidth) +{ + m_lineWidth = nLineWidth; +} + +int ToolsModel::GetShapeStyle() +{ + return m_shapeStyle; +} + +void ToolsModel::SetShapeStyle(int nShapeStyle) +{ + m_shapeStyle = nShapeStyle; +} + +int ToolsModel::GetBrushStyle() +{ + return m_brushStyle; +} + +void ToolsModel::SetBrushStyle(int nBrushStyle) +{ + m_brushStyle = nBrushStyle; +} + +int ToolsModel::GetActiveTool() +{ + return m_activeTool; +} + +void ToolsModel::SetActiveTool(int nActiveTool) +{ + m_activeTool = nActiveTool; +} + +int ToolsModel::GetAirBrushWidth() +{ + return m_airBrushWidth; +} + +void ToolsModel::SetAirBrushWidth(int nAirBrushWidth) +{ + m_airBrushWidth = nAirBrushWidth; +} + +int ToolsModel::GetRubberRadius() +{ + return m_rubberRadius; +} + +void ToolsModel::SetRubberRadius(int nRubberRadius) +{ + m_rubberRadius = nRubberRadius; +} + +BOOL ToolsModel::IsBackgroundTransparent() +{ + return m_transpBg; +} + +void ToolsModel::SetBackgroundTransparent(BOOL bTransparent) +{ + m_transpBg = bTransparent; +} + +int ToolsModel::GetZoom() +{ + return m_zoom; +} + +void ToolsModel::SetZoom(int nZoom) +{ + m_zoom = nZoom; +} Propchange: trunk/reactos/base/applications/mspaint_new/toolsmodel.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mspaint_new/toolsmodel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/toolsmodel.h (added) +++ trunk/reactos/base/applications/mspaint_new/toolsmodel.h [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -0,0 +1,40 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/toolsmodel.h + * PURPOSE: Keep track of tool parameters, notify listeners + * PROGRAMMERS: Benedikt Freisen + */ + +/* CLASSES **********************************************************/ + +class ToolsModel +{ +private: + int m_lineWidth; + int m_shapeStyle; + int m_brushStyle; + int m_activeTool; + int m_airBrushWidth; + int m_rubberRadius; + BOOL m_transpBg; + int m_zoom; +public: + ToolsModel(); + int GetLineWidth(); + void SetLineWidth(int nLineWidth); + int GetShapeStyle(); + void SetShapeStyle(int nShapeStyle); + int GetBrushStyle(); + void SetBrushStyle(int nBrushStyle); + int GetActiveTool(); + void SetActiveTool(int nActiveTool); + int GetAirBrushWidth(); + void SetAirBrushWidth(int nAirBrushWidth); + int GetRubberRadius(); + void SetRubberRadius(int nRubberRadius); + BOOL IsBackgroundTransparent(); + void SetBackgroundTransparent(BOOL bTransparent); + int GetZoom(); + void SetZoom(int nZoom); +}; Propchange: trunk/reactos/base/applications/mspaint_new/toolsmodel.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Tue Jul 7 11:15:24 2015 @@ -19,7 +19,7 @@ void CMainWindow::selectTool(int tool) { selectionWindow.ShowWindow(SW_HIDE); - activeTool = tool; + toolsModel.SetActiveTool(tool); pointSP = 0; // resets the point-buffer of the polygon and bezier functions toolSettingsWindow.Invalidate(TRUE); ::ShowWindow(hTrackbarZoom, (tool == TOOL_ZOOM) ? SW_SHOW : SW_HIDE); @@ -30,7 +30,7 @@ updateCanvasAndScrollbars() { selectionWindow.ShowWindow(SW_HIDE); - imageArea.MoveWindow(3, 3, imgXRes * zoom / 1000, imgYRes * zoom / 1000, FALSE); + imageArea.MoveWindow(3, 3, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, FALSE); scrollboxWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE); @@ -49,15 +49,15 @@ int x, y, w, h; scrollboxWindow.GetClientRect(&clientRectScrollbox); imageArea.GetClientRect(&clientRectImageArea); - w = clientRectImageArea.right * clientRectScrollbox.right / (clientRectImageArea.right * newZoom / zoom); - h = clientRectImageArea.bottom * clientRectScrollbox.bottom / (clientRectImageArea.bottom * newZoom / zoom); - x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)) * newZoom / zoom; - y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)) * newZoom / zoom; - - zoom = newZoom; + w = clientRectImageArea.right * clientRectScrollbox.right / (clientRectImageArea.right * newZoom / toolsModel.GetZoom()); + h = clientRectImageArea.bottom * clientRectScrollbox.bottom / (clientRectImageArea.bottom * newZoom / toolsModel.GetZoom()); + x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)) * newZoom / toolsModel.GetZoom(); + y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)) * newZoom / toolsModel.GetZoom(); + + toolsModel.SetZoom(newZoom); selectionWindow.ShowWindow(SW_HIDE); - imageArea.MoveWindow(3, 3, imgXRes * zoom / 1000, imgYRes * zoom / 1000, FALSE); + imageArea.MoveWindow(3, 3, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, FALSE); scrollboxWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE); @@ -239,7 +239,7 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { HMENU menu = GetMenu(); - BOOL trueSelection = (selectionWindow.IsWindowVisible() && ((activeTool == TOOL_FREESEL) || (activeTool == TOOL_RECTSEL))); + BOOL trueSelection = (selectionWindow.IsWindowVisible() && ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); switch (lParam) { case 0: /* File menu */ @@ -264,27 +264,27 @@ CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(paletteWindow.IsWindowVisible())); CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(hStatusBar))); CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(textEditWindow.IsWindowVisible())); - EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(activeTool == TOOL_TEXT)); + EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); break; case 3: /* Image menu */ EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(selectionWindow.IsWindowVisible())); - CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(transpBg == 0)); - break; - } - - CheckMenuItem(menu, IDM_VIEWZOOM125, CHECKED_IF(zoom == 125)); - CheckMenuItem(menu, IDM_VIEWZOOM25, CHECKED_IF(zoom == 250)); - CheckMenuItem(menu, IDM_VIEWZOOM50, CHECKED_IF(zoom == 500)); - CheckMenuItem(menu, IDM_VIEWZOOM100, CHECKED_IF(zoom == 1000)); - CheckMenuItem(menu, IDM_VIEWZOOM200, CHECKED_IF(zoom == 2000)); - CheckMenuItem(menu, IDM_VIEWZOOM400, CHECKED_IF(zoom == 4000)); - CheckMenuItem(menu, IDM_VIEWZOOM800, CHECKED_IF(zoom == 8000)); - - CheckMenuItem(menu, IDM_COLORSMODERNPALETTE, CHECKED_IF(selectedPalette == 1)); - CheckMenuItem(menu, IDM_COLORSOLDPALETTE, CHECKED_IF(selectedPalette == 2)); + CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(!toolsModel.IsBackgroundTransparent())); + break; + } + + 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_COLORSMODERNPALETTE, CHECKED_IF(paletteModel.SelectedPalette() == 1)); + CheckMenuItem(menu, IDM_COLORSOLDPALETTE, CHECKED_IF(paletteModel.SelectedPalette() == 2)); return 0; } @@ -325,11 +325,11 @@ if (!imageArea.drawing) { /* Deselect */ - if ((activeTool == TOOL_RECTSEL) || (activeTool == TOOL_FREESEL)) - { - startPaintingL(hDrawingDC, 0, 0, fgColor, bgColor); - whilePaintingL(hDrawingDC, 0, 0, fgColor, bgColor); - endPaintingL(hDrawingDC, 0, 0, fgColor, bgColor); + if ((toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_FREESEL)) + { + startPaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + whilePaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + endPaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); selectionWindow.ShowWindow(SW_HIDE); } } @@ -459,13 +459,13 @@ /* remove selection window and already painted content using undo(), paint Rect for rectangular selections and Poly for freeform selections */ undo(); - if (activeTool == TOOL_RECTSEL) + if (toolsModel.GetActiveTool() == TOOL_RECTSEL) { newReversible(); Rect(hDrawingDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, - rectSel_dest.bottom, bgColor, bgColor, 0, TRUE); - } - if (activeTool == TOOL_FREESEL) + rectSel_dest.bottom, paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); + } + if (toolsModel.GetActiveTool() == TOOL_FREESEL) { newReversible(); Poly(hDrawingDC, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE, TRUE); @@ -477,9 +477,9 @@ HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0)); SendMessage(WM_COMMAND, ID_RECTSEL, 0); - startPaintingL(hDrawingDC, 0, 0, fgColor, bgColor); - whilePaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); - endPaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); + startPaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + whilePaintingL(hDrawingDC, imgXRes, imgYRes, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + endPaintingL(hDrawingDC, imgXRes, imgYRes, paletteModel.GetFgColor(), paletteModel.GetBgColor()); break; } case IDM_EDITCOPYTO: @@ -501,18 +501,16 @@ case IDM_COLORSEDITPALETTE: if (ChooseColor(&choosecolor)) { - fgColor = choosecolor.rgbResult; + paletteModel.SetFgColor(choosecolor.rgbResult); paletteWindow.Invalidate(FALSE); } break; case IDM_COLORSMODERNPALETTE: - selectedPalette = 1; - CopyMemory(palColors, modernPalColors, sizeof(palColors)); + paletteModel.SelectPalette(1); paletteWindow.Invalidate(FALSE); break; case IDM_COLORSOLDPALETTE: - selectedPalette = 2; - CopyMemory(palColors, oldPalColors, sizeof(palColors)); + paletteModel.SelectPalette(2); paletteWindow.Invalidate(FALSE); break; case IDM_IMAGEINVERTCOLORS: @@ -526,7 +524,7 @@ } case IDM_IMAGEDELETEIMAGE: newReversible(); - Rect(hDrawingDC, 0, 0, imgXRes, imgYRes, bgColor, bgColor, 0, TRUE); + Rect(hDrawingDC, 0, 0, imgXRes, imgYRes, paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); imageArea.Invalidate(FALSE); break; case IDM_IMAGEROTATEMIRROR: @@ -616,7 +614,7 @@ break; } case IDM_IMAGEDRAWOPAQUE: - transpBg = 1 - transpBg; + toolsModel.SetBackgroundTransparent(!toolsModel.IsBackgroundTransparent()); toolSettingsWindow.Invalidate(TRUE); break; case IDM_IMAGECROP:

9 years, 4 months

[gedmurphy] 68367: [DEVMGR] - last few fixes to the device manager code to get it building with rosbe (msvc) - Next steps are to merge it with the existing devmgr code (mostly done in my WC) and ge...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jul 7 11:05:25 2015 New Revision: 68367 URL: http://svn.reactos.org/svn/reactos?rev=68367&view=rev Log: [DEVMGR] - last few fixes to the device manager code to get it building with rosbe (msvc) - Next steps are to merge it with the existing devmgr code (mostly done in my WC) and get it running via mmc.exe & devmgmt.msc Modified: trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp trunk/reactos/dll/win32/devmgr/devmgmt/Node.h trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/stdafx.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/C… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp [iso-8859-1] Tue Jul 7 11:05:25 2015 @@ -120,7 +120,7 @@ if (ptr) { // This must be an inf based descriptor, the desc is after the semi colon - wcscpy_s(ResourceDescriptor, ResourceDescriptorSize, ++ptr); + StringCbCopyW(ResourceDescriptor, ResourceDescriptorSize, ++ptr); dwError = ERROR_SUCCESS; } else @@ -154,7 +154,7 @@ // Load the string from the dll if (LoadStringW(hModule, ResourceId, ResString, 256)) { - wcscpy_s(ResourceDescriptor, ResourceDescriptorSize, ResString); + StringCbCopyW(ResourceDescriptor, ResourceDescriptorSize, ResString); dwError = ERROR_SUCCESS; } else Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] Tue Jul 7 11:05:25 2015 @@ -274,7 +274,6 @@ _Out_ bool &NeedsReboot ) { - bool Ret = false; bool Canceled = false; SetFlags(DI_NODI_DEFAULTACTION, 0); @@ -376,6 +375,8 @@ NULL, 0); + return true; + } /* PRIVATE METHODS ******************************************************/ @@ -424,9 +425,9 @@ { DevInstallParams.Flags |= Flags; DevInstallParams.FlagsEx |= FlagsEx; - return SetupDiSetDeviceInstallParamsW(m_hDevInfo, - &m_DevinfoData, - &DevInstallParams); + return (SetupDiSetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams) != 0); } return false; } @@ -445,11 +446,11 @@ { DevInstallParams.Flags &= ~Flags; DevInstallParams.FlagsEx &= ~FlagsEx; - return SetupDiSetDeviceInstallParamsW(m_hDevInfo, - &m_DevinfoData, - &DevInstallParams); - } - return false; -} - - + return (SetupDiSetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams) != 0); + } + return false; +} + + Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Tue Jul 7 11:05:25 2015 @@ -19,6 +19,7 @@ #define CLASS_DESC_LEN 256 #define ROOT_NAME_SIZE MAX_COMPUTERNAME_LENGTH + 1 +extern "C" { INT_PTR WINAPI DevicePropertiesExW( @@ -28,7 +29,7 @@ IN DWORD dwFlags OPTIONAL, IN BOOL bShowDevMgr ); - +} typedef INT_PTR(WINAPI *pDevicePropertiesExW)(HWND,LPCWSTR,LPCWSTR,DWORD,BOOL); struct RefreshThreadData @@ -214,7 +215,7 @@ // Node gets deleted on refresh so we copy it to another block size_t Length = wcslen(DeviceId) + 1; ThreadData->DeviceId = new WCHAR[Length]; - wcscpy_s(ThreadData->DeviceId, Length, DeviceId); + StringCbCopyW(ThreadData->DeviceId, Length, DeviceId); } @@ -458,7 +459,6 @@ HTREEITEM hTreeItem = NULL; GUID ClassGuid; INT ClassIndex; - LPTSTR DeviceId = NULL; BOOL bClassSuccess, bSuccess; // Start by adding the root node to the tree @@ -475,7 +475,7 @@ bool bClassUnknown = false; bool AddedParent = false; INT DeviceIndex = 0; - BOOL MoreItems; + bool MoreItems = false; // Get the cached class node ClassNode = GetClassNode(&ClassGuid); @@ -500,11 +500,11 @@ DeviceIndex, &DeviceInfoData); if (bSuccess == FALSE && GetLastError() == ERROR_NO_MORE_ITEMS) - MoreItems = FALSE; + MoreItems = false; if (bSuccess) { - MoreItems = TRUE; + MoreItems = true; // The unknown class handle contains all devices on the system, // and we're just looking for the ones with a null GUID Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Tue Jul 7 11:05:25 2015 @@ -208,7 +208,7 @@ bool CMainWindow::RefreshView(ViewType Type) { - UINT CheckId; + UINT CheckId = 0; BOOL bSuccess; // Refreshed the cached view @@ -312,7 +312,7 @@ return bRet; } -void CMainWindow::UpdateToolbar(_In_ LPTV_ITEMW TvItem) +void CMainWindow::UpdateToolbar() { WORD State; @@ -466,14 +466,12 @@ { case TVN_SELCHANGED: { - LPNMTREEVIEW NmTreeView = (LPNMTREEVIEW)lParam; - UpdateToolbar(&NmTreeView->itemNew); + UpdateToolbar(); break; } case NM_DBLCLK: { - LPNMTREEVIEW NmTreeView = (LPNMTREEVIEW)lParam; m_DeviceView->DisplayPropertySheet(); break; } @@ -531,7 +529,7 @@ LRESULT CMainWindow::OnCommand(WPARAM wParam, - LPARAM lParam) + LPARAM /*lParam*/) { LRESULT RetCode = 0; WORD Msg; @@ -792,9 +790,9 @@ BOOL WINAPI -DeviceManager_ExecuteW(HWND hWndParent, +DeviceManager_ExecuteW(HWND /*hWndParent*/, HINSTANCE hInst, - LPCWSTR lpMachineName, + LPCWSTR /*lpMachineName*/, int nCmdShow) { CMainWindow MainWindow; Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Tue Jul 7 11:05:25 2015 @@ -46,7 +46,6 @@ bool CreateStatusBar(); void UpdateToolbar( - _In_ LPTV_ITEMW TvItem ); bool StatusBarLoadString( Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] Tue Jul 7 11:05:25 2015 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/devmgr/devmgr/node.cpp -* PURPOSE: Object for each device in the tree +* PURPOSE: Abstract base object for each node in the tree * COPYRIGHT: Copyright 2015 Ged Murphy <gedmurphy(a)reactos.org> * */ Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Node.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Node.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Node.h [iso-8859-1] Tue Jul 7 11:05:25 2015 @@ -34,11 +34,6 @@ LPWSTR GetDisplayName() { return m_DisplayName; } INT GetClassImage() { return m_ClassImage; } LPWSTR GetDeviceId() { return m_DeviceId; } - bool HasProperties() { return (m_DeviceId != NULL); } - -private: - void Cleanup(); - }; Modified: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] Tue Jul 7 11:05:25 2015 @@ -53,7 +53,7 @@ // The root name is the computer name DWORD Size = DISPLAY_NAME_LEN; if (GetComputerNameW(m_DisplayName, &Size)) - _wcslwr_s(m_DisplayName); + _wcslwr(m_DisplayName); return true; Modified: trunk/reactos/dll/win32/devmgr/devmgmt/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/s… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/stdafx.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/stdafx.h [iso-8859-1] Tue Jul 7 11:05:25 2015 @@ -1,6 +1,6 @@ #pragma once -#ifndef __REACTOS___ +#ifndef __REACTOS__ #define WIN32_LEAN_AND_MEAN #include <Windows.h> @@ -13,16 +13,20 @@ #include <devguid.h> #include <process.h> + #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit #include <tchar.h> #include <atlbase.h> #include <atlstr.h> #include <atlcoll.h> +#include <strsafe.h> #else +#include <string.h> +#include <wchar.h> + #include <tchar.h> - #include <windef.h> #include <winbase.h> #include <winreg.h> @@ -33,18 +37,17 @@ #include <shlwapi.h> #include <strsafe.h> #include <process.h> - -#include <string.h> -#include <wchar.h> +#include <WindowsX.h> +#include <strsafe.h> #include <setupapi.h> #include <commctrl.h> #include <cfgmgr32.h> #include <Uxtheme.h> +#include <devguid.h> #include <atlbase.h> -#include <atlcom.h> -#include <atlwin.h> #include <atlstr.h> +#include <atlcoll.h> #endif

9 years, 4 months

[bfreisen] 68366: [MSPAINT_NEW] split CMainWindow: factor out CImgAreaWindow and CMiniatureWindow (second batch of git commits)

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Tue Jul 7 11:02:30 2015 New Revision: 68366 URL: http://svn.reactos.org/svn/reactos?rev=68366&view=rev Log: [MSPAINT_NEW] split CMainWindow: factor out CImgAreaWindow and CMiniatureWindow (second batch of git commits) Added: trunk/reactos/base/applications/mspaint_new/imgarea.cpp (with props) trunk/reactos/base/applications/mspaint_new/imgarea.h (with props) trunk/reactos/base/applications/mspaint_new/miniature.cpp (with props) trunk/reactos/base/applications/mspaint_new/miniature.h (with props) Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/precomp.h trunk/reactos/base/applications/mspaint_new/winproc.cpp trunk/reactos/base/applications/mspaint_new/winproc.h Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] Tue Jul 7 11:02:30 2015 @@ -9,7 +9,9 @@ dib.cpp drawing.cpp history.cpp + imgarea.cpp main.cpp + miniature.cpp mouse.cpp palette.cpp registry.cpp Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] Tue Jul 7 11:02:30 2015 @@ -96,22 +96,24 @@ extern BOOL showMiniature; class CMainWindow; +class CMiniatureWindow; class CToolSettingsWindow; class CPaletteWindow; class CScrollboxWindow; class CSelectionWindow; +class CImgAreaWindow; class CSizeboxWindow; class CTextEditWindow; extern CMainWindow mainWindow; -extern CMainWindow miniature; +extern CMiniatureWindow miniature; extern CMainWindow toolBoxContainer; extern CToolSettingsWindow toolSettingsWindow; extern CPaletteWindow paletteWindow; extern CScrollboxWindow scrollboxWindow; extern CScrollboxWindow scrlClientWindow; extern CSelectionWindow selectionWindow; -extern CMainWindow imageArea; +extern CImgAreaWindow imageArea; extern CSizeboxWindow sizeboxLeftTop; extern CSizeboxWindow sizeboxCenterTop; extern CSizeboxWindow sizeboxRightTop; Added: trunk/reactos/base/applications/mspaint_new/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.cpp (added) +++ trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] Tue Jul 7 11:02:30 2015 @@ -0,0 +1,323 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/imgarea.cpp + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * PROGRAMMERS: Benedikt Freisen + */ + +/* INCLUDES *********************************************************/ + +#include "precomp.h" + +#include "dialogs.h" +#include "registry.h" + +/* FUNCTIONS ********************************************************/ + +extern void +zoomTo(int newZoom, int mouseX, int mouseY); + +void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY) +{ + HDC hdc; + HPEN oldPen; + HBRUSH oldBrush; + LOGBRUSH logbrush; + int rop; + + RECT clientRectScrollbox; + RECT clientRectImageArea; + int x, y, w, h; + scrollboxWindow.GetClientRect(&clientRectScrollbox); + GetClientRect(&clientRectImageArea); + w = clientRectImageArea.right * clientRectScrollbox.right / (clientRectImageArea.right * 2); + h = clientRectImageArea.bottom * clientRectScrollbox.bottom / (clientRectImageArea.bottom * 2); + x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)); + y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)); + + hdc = GetDC(); + oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 0, 0)); + logbrush.lbStyle = BS_HOLLOW; + oldBrush = (HBRUSH) SelectObject(hdc, CreateBrushIndirect(&logbrush)); + rop = SetROP2(hdc, R2_NOT); + Rectangle(hdc, x, y, x + w, y + h); + SetROP2(hdc, rop); + DeleteObject(SelectObject(hdc, oldBrush)); + DeleteObject(SelectObject(hdc, oldPen)); + ReleaseDC(hdc); +} + +LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + sizeboxLeftTop.MoveWindow( + 0, + 0, 3, 3, TRUE); + sizeboxCenterTop.MoveWindow( + imgXRes * zoom / 2000 + 3 * 3 / 4, + 0, 3, 3, TRUE); + sizeboxRightTop.MoveWindow( + imgXRes * zoom / 1000 + 3, + 0, 3, 3, TRUE); + sizeboxLeftCenter.MoveWindow( + 0, + imgYRes * zoom / 2000 + 3 * 3 / 4, 3, 3, TRUE); + sizeboxRightCenter.MoveWindow( + imgXRes * zoom / 1000 + 3, + imgYRes * zoom / 2000 + 3 * 3 / 4, 3, 3, TRUE); + sizeboxLeftBottom.MoveWindow( + 0, + imgYRes * zoom / 1000 + 3, 3, 3, TRUE); + sizeboxCenterBottom.MoveWindow( + imgXRes * zoom / 2000 + 3 * 3 / 4, + imgYRes * zoom / 1000 + 3, 3, 3, TRUE); + sizeboxRightBottom.MoveWindow( + imgXRes * zoom / 1000 + 3, + imgYRes * zoom / 1000 + 3, 3, 3, TRUE); + UpdateScrollbox(); + return 0; +} + +LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + DefWindowProc(WM_PAINT, wParam, lParam); + HDC hdc = imageArea.GetDC(); + StretchBlt(hdc, 0, 0, imgXRes * zoom / 1000, imgYRes * zoom / 1000, hDrawingDC, 0, 0, imgXRes, + imgYRes, SRCCOPY); + if (showGrid && (zoom >= 4000)) + { + HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, 0x00a0a0a0)); + int counter; + for(counter = 0; counter <= imgYRes; counter++) + { + MoveToEx(hdc, 0, counter * zoom / 1000, NULL); + LineTo(hdc, imgXRes * zoom / 1000, counter * zoom / 1000); + } + for(counter = 0; counter <= imgXRes; counter++) + { + MoveToEx(hdc, counter * zoom / 1000, 0, NULL); + LineTo(hdc, counter * zoom / 1000, imgYRes * zoom / 1000); + } + DeleteObject(SelectObject(hdc, oldPen)); + } + imageArea.ReleaseDC(hdc); + selectionWindow.Invalidate(FALSE); + miniature.Invalidate(FALSE); + return 0; +} + +LRESULT CImgAreaWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + switch (activeTool) + { + case TOOL_FILL: + SetCursor(hCurFill); + break; + case TOOL_COLOR: + SetCursor(hCurColor); + break; + case TOOL_ZOOM: + SetCursor(hCurZoom); + break; + case TOOL_PEN: + SetCursor(hCurPen); + break; + case TOOL_AIRBRUSH: + SetCursor(hCurAirbrush); + break; + default: + SetCursor(LoadCursor(NULL, IDC_CROSS)); + } + return 0; +} + +LRESULT CImgAreaWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if ((!drawing) || (activeTool == TOOL_COLOR)) + { + SetCapture(); + drawing = TRUE; + startPaintingL(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, + fgColor, bgColor); + } + else + { + SendMessage(WM_LBUTTONUP, wParam, lParam); + undo(); + } + Invalidate(FALSE); + if ((activeTool == TOOL_ZOOM) && (zoom < 8000)) + zoomTo(zoom * 2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return 0; +} + +LRESULT CImgAreaWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if ((!drawing) || (activeTool == TOOL_COLOR)) + { + SetCapture(); + drawing = TRUE; + startPaintingR(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, + fgColor, bgColor); + } + else + { + SendMessage(WM_RBUTTONUP, wParam, lParam); + undo(); + } + Invalidate(FALSE); + if ((activeTool == TOOL_ZOOM) && (zoom > 125)) + zoomTo(zoom / 2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return 0; +} + +LRESULT CImgAreaWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (drawing) + { + ReleaseCapture(); + drawing = FALSE; + endPaintingL(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, fgColor, + bgColor); + Invalidate(FALSE); + if (activeTool == TOOL_COLOR) + { + COLORREF tempColor = + GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom); + if (tempColor != CLR_INVALID) + fgColor = tempColor; + paletteWindow.Invalidate(FALSE); + } + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); + } + return 0; +} + +LRESULT CImgAreaWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (drawing) + { + ReleaseCapture(); + drawing = FALSE; + endPaintingR(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, fgColor, + bgColor); + Invalidate(FALSE); + if (activeTool == TOOL_COLOR) + { + COLORREF tempColor = + GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom); + if (tempColor != CLR_INVALID) + bgColor = tempColor; + paletteWindow.Invalidate(FALSE); + } + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); + } + return 0; +} + +LRESULT CImgAreaWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + LONG xNow = GET_X_LPARAM(lParam) * 1000 / zoom; + LONG yNow = GET_Y_LPARAM(lParam) * 1000 / zoom; + if ((!drawing) || (activeTool <= TOOL_AIRBRUSH)) + { + TRACKMOUSEEVENT tme; + + if (activeTool == TOOL_ZOOM) + { + Invalidate(FALSE); + UpdateWindow(); + drawZoomFrame(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + } + + tme.cbSize = sizeof(TRACKMOUSEEVENT); + tme.dwFlags = TME_LEAVE; + tme.hwndTrack = imageArea.m_hWnd; + tme.dwHoverTime = 0; + TrackMouseEvent(&tme); + + if (!drawing) + { + TCHAR coordStr[100]; + _stprintf(coordStr, _T("%ld, %ld"), xNow, yNow); + SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); + } + } + if (drawing) + { + /* values displayed in statusbar */ + LONG xRel = xNow - start.x; + LONG yRel = yNow - start.y; + /* freesel, rectsel and text tools always show numbers limited to fit into image area */ + if ((activeTool == TOOL_FREESEL) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_TEXT)) + { + if (xRel < 0) + xRel = (xNow < 0) ? -start.x : xRel; + else if (xNow > imgXRes) + xRel = imgXRes-start.x; + if (yRel < 0) + yRel = (yNow < 0) ? -start.y : yRel; + else if (yNow > imgYRes) + yRel = imgYRes-start.y; + } + /* rectsel and shape tools always show non-negative numbers when drawing */ + if ((activeTool == TOOL_RECTSEL) || (activeTool == TOOL_SHAPE)) + { + if (xRel < 0) + xRel = -xRel; + if (yRel < 0) + yRel = -yRel; + } + /* while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 */ + switch(activeTool) + { + case TOOL_RUBBER: + case TOOL_PEN: + case TOOL_BRUSH: + case TOOL_AIRBRUSH: + case TOOL_SHAPE: + { + TCHAR coordStr[100]; + _stprintf(coordStr, _T("%ld, %ld"), xNow, yNow); + SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); + break; + } + } + if ((wParam & MK_LBUTTON) != 0) + { + whilePaintingL(hDrawingDC, xNow, yNow, fgColor, bgColor); + Invalidate(FALSE); + if ((activeTool >= TOOL_TEXT) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_FREESEL)) + { + TCHAR sizeStr[100]; + if ((activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + yRel = xRel; + _stprintf(sizeStr, _T("%ld x %ld"), xRel, yRel); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); + } + } + if ((wParam & MK_RBUTTON) != 0) + { + whilePaintingR(hDrawingDC, xNow, yNow, fgColor, bgColor); + Invalidate(FALSE); + if (activeTool >= TOOL_TEXT) + { + TCHAR sizeStr[100]; + if ((activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + yRel = xRel; + _stprintf(sizeStr, _T("%ld x %ld"), xRel, yRel); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); + } + } + } + return 0; +} + +LRESULT CImgAreaWindow::OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) _T("")); + if (activeTool == TOOL_ZOOM) + imageArea.Invalidate(FALSE); + return 0; +} Propchange: trunk/reactos/base/applications/mspaint_new/imgarea.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mspaint_new/imgarea.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.h (added) +++ trunk/reactos/base/applications/mspaint_new/imgarea.h [iso-8859-1] Tue Jul 7 11:02:30 2015 @@ -0,0 +1,41 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/imgarea.h + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * PROGRAMMERS: Benedikt Freisen + */ + +class CImgAreaWindow : public CWindowImpl<CMainWindow> +{ +public: + DECLARE_WND_CLASS_EX(_T("ImgAreaWindow"), CS_DBLCLKS, COLOR_BTNFACE) + + BEGIN_MSG_MAP(CPaletteWindow) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) + MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) + MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) + MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) + MESSAGE_HANDLER(WM_MOUSELEAVE, OnMouseLeave) + END_MSG_MAP() + + BOOL drawing; + +private: + LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + + void drawZoomFrame(int mouseX, int mouseY); +}; Propchange: trunk/reactos/base/applications/mspaint_new/imgarea.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] Tue Jul 7 11:02:30 2015 @@ -104,14 +104,14 @@ BOOL showMiniature = FALSE; CMainWindow mainWindow; -CMainWindow miniature; +CMiniatureWindow miniature; CMainWindow toolBoxContainer; CToolSettingsWindow toolSettingsWindow; CPaletteWindow paletteWindow; CScrollboxWindow scrollboxWindow; CScrollboxWindow scrlClientWindow; CSelectionWindow selectionWindow; -CMainWindow imageArea; +CImgAreaWindow imageArea; CSizeboxWindow sizeboxLeftTop; CSizeboxWindow sizeboxCenterTop; CSizeboxWindow sizeboxRightTop; Added: trunk/reactos/base/applications/mspaint_new/miniature.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/miniature.cpp (added) +++ trunk/reactos/base/applications/mspaint_new/miniature.cpp [iso-8859-1] Tue Jul 7 11:02:30 2015 @@ -0,0 +1,39 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/miniature.cpp + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * PROGRAMMERS: Benedikt Freisen + */ + +/* INCLUDES *********************************************************/ + +#include "precomp.h" + +/* FUNCTIONS ********************************************************/ + +LRESULT CMiniatureWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + miniature.ShowWindow(SW_HIDE); + showMiniature = FALSE; + return 0; +} + +LRESULT CMiniatureWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + DefWindowProc(WM_PAINT, wParam, lParam); + RECT mclient; + HDC hdc; + miniature.GetClientRect(&mclient); + hdc = miniature.GetDC(); + StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, hDrawingDC, 0, 0, imgXRes, imgYRes, SRCCOPY); + miniature.ReleaseDC(hdc); + return 0; +} + +LRESULT CMiniatureWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + SetCursor(LoadCursor(NULL, IDC_ARROW)); + return 0; +} Propchange: trunk/reactos/base/applications/mspaint_new/miniature.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mspaint_new/miniature.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/miniature.h (added) +++ trunk/reactos/base/applications/mspaint_new/miniature.h [iso-8859-1] Tue Jul 7 11:02:30 2015 @@ -0,0 +1,24 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint_new/miniature.h + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * PROGRAMMERS: Benedikt Freisen + */ + +class CMiniatureWindow : public CWindowImpl<CMiniatureWindow> +{ +public: + DECLARE_WND_CLASS_EX(_T("MiniatureWindow"), CS_DBLCLKS, COLOR_BTNFACE) + + BEGIN_MSG_MAP(CPaletteWindow) + MESSAGE_HANDLER(WM_CLOSE, OnClose) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) + END_MSG_MAP() + + LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); +}; Propchange: trunk/reactos/base/applications/mspaint_new/miniature.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mspaint_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] Tue Jul 7 11:02:30 2015 @@ -23,6 +23,8 @@ #include "dib.h" #include "globalvar.h" #include "history.h" +#include "imgarea.h" +#include "miniature.h" #include "mouse.h" #include "palette.h" #include "scrollbox.h" Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Tue Jul 7 11:02:30 2015 @@ -16,14 +16,13 @@ /* FUNCTIONS ********************************************************/ -void -selectTool(int tool) +void CMainWindow::selectTool(int tool) { selectionWindow.ShowWindow(SW_HIDE); activeTool = tool; pointSP = 0; // resets the point-buffer of the polygon and bezier functions toolSettingsWindow.Invalidate(TRUE); - ShowWindow(hTrackbarZoom, (tool == TOOL_ZOOM) ? SW_SHOW : SW_HIDE); + ::ShowWindow(hTrackbarZoom, (tool == TOOL_ZOOM) ? SW_SHOW : SW_HIDE); textEditWindow.ShowWindow((tool == TOOL_TEXT) ? SW_SHOW : SW_HIDE); } @@ -73,39 +72,7 @@ SendMessage(hTrackbarZoom, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) tbPos); } -void -drawZoomFrame(int mouseX, int mouseY) -{ - HDC hdc; - HPEN oldPen; - HBRUSH oldBrush; - LOGBRUSH logbrush; - int rop; - - RECT clientRectScrollbox; - RECT clientRectImageArea; - int x, y, w, h; - scrollboxWindow.GetClientRect(&clientRectScrollbox); - imageArea.GetClientRect(&clientRectImageArea); - w = clientRectImageArea.right * clientRectScrollbox.right / (clientRectImageArea.right * 2); - h = clientRectImageArea.bottom * clientRectScrollbox.bottom / (clientRectImageArea.bottom * 2); - x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)); - y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)); - - hdc = imageArea.GetDC(); - oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 0, 0)); - logbrush.lbStyle = BS_HOLLOW; - oldBrush = (HBRUSH) SelectObject(hdc, CreateBrushIndirect(&logbrush)); - rop = SetROP2(hdc, R2_NOT); - Rectangle(hdc, x, y, x + w, y + h); - SetROP2(hdc, rop); - DeleteObject(SelectObject(hdc, oldBrush)); - DeleteObject(SelectObject(hdc, oldPen)); - imageArea.ReleaseDC(hdc); -} - -void -alignChildrenToMainWindow() +void CMainWindow::alignChildrenToMainWindow() { int x, y, w, h; RECT clientRect; @@ -132,12 +99,11 @@ h = clientRect.bottom - 3; } - scrollboxWindow.MoveWindow(x, y, w, IsWindowVisible(hStatusBar) ? h - 23 : h, TRUE); + scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - 23 : h, TRUE); paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); } -void -saveImage(BOOL overwrite) +void CMainWindow::saveImage(BOOL overwrite) { if (isAFile && overwrite) { @@ -161,8 +127,7 @@ } } -void -UpdateApplicationProperties(HBITMAP bitmap, LPTSTR newfilename, LPTSTR newfilepathname) +void CMainWindow::UpdateApplicationProperties(HBITMAP bitmap, LPTSTR newfilename, LPTSTR newfilepathname) { TCHAR tempstr[1000]; TCHAR resstr[100]; @@ -172,13 +137,12 @@ CopyMemory(filepathname, newfilepathname, sizeof(filepathname)); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(tempstr, resstr, filename); - mainWindow.SetWindowText(tempstr); + SetWindowText(tempstr); clearHistory(); isAFile = TRUE; } -void -InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) +void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) { HDC hTempDC; HBITMAP hTempMask; @@ -209,8 +173,6 @@ ForceRefreshSelectionContents(); } -BOOL drawing; - LRESULT CMainWindow::OnDropFiles(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { HDROP drophandle; @@ -247,12 +209,6 @@ LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_hWnd == miniature.m_hWnd) - { - miniature.ShowWindow(SW_HIDE); - showMiniature = FALSE; - return 0; - } if (!imageSaved) { TCHAR programname[20]; @@ -342,37 +298,6 @@ alignChildrenToMainWindow(); Invalidate(TRUE); } - if (m_hWnd == imageArea.m_hWnd) - { - sizeboxLeftTop.MoveWindow( - 0, - 0, 3, 3, TRUE); - sizeboxCenterTop.MoveWindow( - imgXRes * zoom / 2000 + 3 * 3 / 4, - 0, 3, 3, TRUE); - sizeboxRightTop.MoveWindow( - imgXRes * zoom / 1000 + 3, - 0, 3, 3, TRUE); - sizeboxLeftCenter.MoveWindow( - 0, - imgYRes * zoom / 2000 + 3 * 3 / 4, 3, 3, TRUE); - sizeboxRightCenter.MoveWindow( - imgXRes * zoom / 1000 + 3, - imgYRes * zoom / 2000 + 3 * 3 / 4, 3, 3, TRUE); - sizeboxLeftBottom.MoveWindow( - 0, - imgYRes * zoom / 1000 + 3, 3, 3, TRUE); - sizeboxCenterBottom.MoveWindow( - imgXRes * zoom / 2000 + 3 * 3 / 4, - imgYRes * zoom / 1000 + 3, 3, 3, TRUE); - sizeboxRightBottom.MoveWindow( - imgXRes * zoom / 1000 + 3, - imgYRes * zoom / 1000 + 3, 3, 3, TRUE); - } - if (m_hWnd == imageArea.m_hWnd) - { - UpdateScrollbox(); - } return 0; } @@ -387,163 +312,9 @@ return 0; } -LRESULT CMainWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - DefWindowProc(WM_PAINT, wParam, lParam); - if (m_hWnd == imageArea.m_hWnd) - { - HDC hdc = imageArea.GetDC(); - StretchBlt(hdc, 0, 0, imgXRes * zoom / 1000, imgYRes * zoom / 1000, hDrawingDC, 0, 0, imgXRes, - imgYRes, SRCCOPY); - if (showGrid && (zoom >= 4000)) - { - HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, 0x00a0a0a0)); - int counter; - for(counter = 0; counter <= imgYRes; counter++) - { - MoveToEx(hdc, 0, counter * zoom / 1000, NULL); - LineTo(hdc, imgXRes * zoom / 1000, counter * zoom / 1000); - } - for(counter = 0; counter <= imgXRes; counter++) - { - MoveToEx(hdc, counter * zoom / 1000, 0, NULL); - LineTo(hdc, counter * zoom / 1000, imgYRes * zoom / 1000); - } - DeleteObject(SelectObject(hdc, oldPen)); - } - imageArea.ReleaseDC(hdc); - selectionWindow.Invalidate(FALSE); - miniature.Invalidate(FALSE); - } - else if (m_hWnd == miniature.m_hWnd) - { - RECT mclient; - HDC hdc; - miniature.GetClientRect(&mclient); - hdc = miniature.GetDC(); - StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, hDrawingDC, 0, 0, imgXRes, imgYRes, SRCCOPY); - miniature.ReleaseDC(hdc); - } - return 0; -} - LRESULT CMainWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_hWnd == imageArea.m_hWnd) - { - switch (activeTool) - { - case TOOL_FILL: - SetCursor(hCurFill); - break; - case TOOL_COLOR: - SetCursor(hCurColor); - break; - case TOOL_ZOOM: - SetCursor(hCurZoom); - break; - case TOOL_PEN: - SetCursor(hCurPen); - break; - case TOOL_AIRBRUSH: - SetCursor(hCurAirbrush); - break; - default: - SetCursor(LoadCursor(NULL, IDC_CROSS)); - } - } - else - SetCursor(LoadCursor(NULL, IDC_ARROW)); - return 0; -} - -LRESULT CMainWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if (m_hWnd == imageArea.m_hWnd) - { - if ((!drawing) || (activeTool == TOOL_COLOR)) - { - SetCapture(); - drawing = TRUE; - startPaintingL(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, - fgColor, bgColor); - } - else - { - SendMessage(WM_LBUTTONUP, wParam, lParam); - undo(); - } - Invalidate(FALSE); - if ((activeTool == TOOL_ZOOM) && (zoom < 8000)) - zoomTo(zoom * 2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); - } - return 0; -} - -LRESULT CMainWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if (m_hWnd == imageArea.m_hWnd) - { - if ((!drawing) || (activeTool == TOOL_COLOR)) - { - SetCapture(); - drawing = TRUE; - startPaintingR(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, - fgColor, bgColor); - } - else - { - SendMessage(WM_RBUTTONUP, wParam, lParam); - undo(); - } - Invalidate(FALSE); - if ((activeTool == TOOL_ZOOM) && (zoom > 125)) - zoomTo(zoom / 2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); - } - return 0; -} - -LRESULT CMainWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if ((m_hWnd == imageArea.m_hWnd) && drawing) - { - ReleaseCapture(); - drawing = FALSE; - endPaintingL(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, fgColor, - bgColor); - Invalidate(FALSE); - if (activeTool == TOOL_COLOR) - { - COLORREF tempColor = - GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom); - if (tempColor != CLR_INVALID) - fgColor = tempColor; - paletteWindow.Invalidate(FALSE); - } - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); - } - return 0; -} - -LRESULT CMainWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if ((m_hWnd == imageArea.m_hWnd) && drawing) - { - ReleaseCapture(); - drawing = FALSE; - endPaintingR(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom, fgColor, - bgColor); - Invalidate(FALSE); - if (activeTool == TOOL_COLOR) - { - COLORREF tempColor = - GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom); - if (tempColor != CLR_INVALID) - bgColor = tempColor; - paletteWindow.Invalidate(FALSE); - } - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); - } + SetCursor(LoadCursor(NULL, IDC_ARROW)); return 0; } @@ -551,7 +322,7 @@ { if (wParam == VK_ESCAPE) { - if (!drawing) + if (!imageArea.drawing) { /* Deselect */ if ((activeTool == TOOL_RECTSEL) || (activeTool == TOOL_FREESEL)) @@ -564,115 +335,6 @@ } /* FIXME: also cancel current drawing underway */ } - return 0; -} - -LRESULT CMainWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if (m_hWnd == imageArea.m_hWnd) - { - LONG xNow = GET_X_LPARAM(lParam) * 1000 / zoom; - LONG yNow = GET_Y_LPARAM(lParam) * 1000 / zoom; - if ((!drawing) || (activeTool <= TOOL_AIRBRUSH)) - { - TRACKMOUSEEVENT tme; - - if (activeTool == TOOL_ZOOM) - { - Invalidate(FALSE); - UpdateWindow(); - drawZoomFrame(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); - } - - tme.cbSize = sizeof(TRACKMOUSEEVENT); - tme.dwFlags = TME_LEAVE; - tme.hwndTrack = imageArea.m_hWnd; - tme.dwHoverTime = 0; - TrackMouseEvent(&tme); - - if (!drawing) - { - TCHAR coordStr[100]; - _stprintf(coordStr, _T("%ld, %ld"), xNow, yNow); - SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); - } - } - if (drawing) - { - /* values displayed in statusbar */ - LONG xRel = xNow - start.x; - LONG yRel = yNow - start.y; - /* freesel, rectsel and text tools always show numbers limited to fit into image area */ - if ((activeTool == TOOL_FREESEL) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_TEXT)) - { - if (xRel < 0) - xRel = (xNow < 0) ? -start.x : xRel; - else if (xNow > imgXRes) - xRel = imgXRes-start.x; - if (yRel < 0) - yRel = (yNow < 0) ? -start.y : yRel; - else if (yNow > imgYRes) - yRel = imgYRes-start.y; - } - /* rectsel and shape tools always show non-negative numbers when drawing */ - if ((activeTool == TOOL_RECTSEL) || (activeTool == TOOL_SHAPE)) - { - if (xRel < 0) - xRel = -xRel; - if (yRel < 0) - yRel = -yRel; - } - /* while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 */ - switch(activeTool) - { - case TOOL_RUBBER: - case TOOL_PEN: - case TOOL_BRUSH: - case TOOL_AIRBRUSH: - case TOOL_SHAPE: - { - TCHAR coordStr[100]; - _stprintf(coordStr, _T("%ld, %ld"), xNow, yNow); - SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); - break; - } - } - if ((wParam & MK_LBUTTON) != 0) - { - whilePaintingL(hDrawingDC, xNow, yNow, fgColor, bgColor); - Invalidate(FALSE); - if ((activeTool >= TOOL_TEXT) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_FREESEL)) - { - TCHAR sizeStr[100]; - if ((activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) - yRel = xRel; - _stprintf(sizeStr, _T("%ld x %ld"), xRel, yRel); - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); - } - } - if ((wParam & MK_RBUTTON) != 0) - { - whilePaintingR(hDrawingDC, xNow, yNow, fgColor, bgColor); - Invalidate(FALSE); - if (activeTool >= TOOL_TEXT) - { - TCHAR sizeStr[100]; - if ((activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) - yRel = xRel; - _stprintf(sizeStr, _T("%ld x %ld"), xRel, yRel); - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); - } - } - } - } - return 0; -} - -LRESULT CMainWindow::OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) _T("")); - if (activeTool == TOOL_ZOOM) - imageArea.Invalidate(FALSE); return 0; } Modified: trunk/reactos/base/applications/mspaint_new/winproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.h [iso-8859-1] Tue Jul 7 11:02:30 2015 @@ -20,15 +20,8 @@ MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_GETMINMAXINFO, OnGetMinMaxInfo) - MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) - MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) - MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) - MESSAGE_HANDLER(WM_MOUSELEAVE, OnMouseLeave) MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) MESSAGE_HANDLER(WM_COMMAND, OnCommand) END_MSG_MAP() @@ -40,15 +33,14 @@ LRESULT OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnGetMinMaxInfo(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + + void selectTool(int tool); + void alignChildrenToMainWindow(); + void saveImage(BOOL overwrite); + void UpdateApplicationProperties(HBITMAP bitmap, LPTSTR newfilename, LPTSTR newfilepathname); + void InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window); };

9 years, 4 months

[bfreisen] 68365: [MSPAINT_NEW] port to ATL (first batch of git commits)

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Tue Jul 7 10:42:49 2015 New Revision: 68365 URL: http://svn.reactos.org/svn/reactos?rev=68365&view=rev Log: [MSPAINT_NEW] port to ATL (first batch of git commits) Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt trunk/reactos/base/applications/mspaint_new/dialogs.cpp trunk/reactos/base/applications/mspaint_new/dib.cpp trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/history.cpp trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/mouse.cpp trunk/reactos/base/applications/mspaint_new/palette.cpp trunk/reactos/base/applications/mspaint_new/palette.h trunk/reactos/base/applications/mspaint_new/precomp.h trunk/reactos/base/applications/mspaint_new/scrollbox.cpp trunk/reactos/base/applications/mspaint_new/scrollbox.h trunk/reactos/base/applications/mspaint_new/selection.cpp trunk/reactos/base/applications/mspaint_new/selection.h trunk/reactos/base/applications/mspaint_new/sizebox.cpp trunk/reactos/base/applications/mspaint_new/sizebox.h trunk/reactos/base/applications/mspaint_new/textedit.cpp trunk/reactos/base/applications/mspaint_new/textedit.h trunk/reactos/base/applications/mspaint_new/toolsettings.cpp trunk/reactos/base/applications/mspaint_new/toolsettings.h trunk/reactos/base/applications/mspaint_new/winproc.cpp trunk/reactos/base/applications/mspaint_new/winproc.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/dib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/mouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/palette.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/scrollbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/scrollbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/selection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/selection.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/sizebox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/sizebox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/textedit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/textedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/toolsettings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/toolsettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/winproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…

9 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015