diff --git a/Scylla/Scylla.vcxproj b/Scylla/Scylla.vcxproj index b9a8c22..9795845 100644 --- a/Scylla/Scylla.vcxproj +++ b/Scylla/Scylla.vcxproj @@ -1,227 +1,226 @@  Debug Win32 Debug x64 Release Win32 Release x64 {710434C9-FC4B-4F1D-B318-E10ADC78499F} Win32Proj Scylla Application true Unicode Application true Unicode Application false true Unicode v100 Application false true Unicode true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) $(SolutionDir)diStorm\include;%(AdditionalIncludeDirectories) Windows true $(SolutionDir)$(Platform)\$(Configuration)\diStorm.lib;%(AdditionalDependencies) type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) $(SolutionDir)diStorm\include;%(AdditionalIncludeDirectories) Windows true $(SolutionDir)$(Platform)\$(Configuration)\diStorm.lib;%(AdditionalDependencies) type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' Level3 MaxSpeed true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded $(SolutionDir)diStorm\include;%(AdditionalIncludeDirectories) true Windows false true true $(SolutionDir)$(Platform)\$(Configuration)\diStorm.lib;%(AdditionalDependencies) type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' Level3 MaxSpeed true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded $(SolutionDir)diStorm\include;%(AdditionalIncludeDirectories) true Windows false true true $(SolutionDir)$(Platform)\$(Configuration)\diStorm.lib;%(AdditionalDependencies) type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' - \ No newline at end of file diff --git a/Scylla/Scylla.vcxproj.filters b/Scylla/Scylla.vcxproj.filters index 4687dbd..b868530 100644 --- a/Scylla/Scylla.vcxproj.filters +++ b/Scylla/Scylla.vcxproj.filters @@ -1,190 +1,187 @@  {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hpp;hxx;hm;inl;inc;xsd {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms {e037d0d5-35ad-4034-83db-746a56a4fee7} {6f76186f-b79c-41e2-8939-05d9de028aad} Quelldateien Quelldateien\GUI Quelldateien\GUI Quelldateien Quelldateien\GUI Quelldateien\GUI Quelldateien Quelldateien Quelldateien Quelldateien Quelldateien Quelldateien Quelldateien Quelldateien Quelldateien Quelldateien Quelldateien\GUI Quelldateien Quelldateien Quelldateien\GUI Quelldateien\GUI - - Quelldateien\GUI - Quelldateien\GUI Headerdateien Headerdateien\GUI Headerdateien\GUI Headerdateien Headerdateien\GUI Headerdateien\GUI Headerdateien Headerdateien Headerdateien Headerdateien\GUI Headerdateien Headerdateien Headerdateien Headerdateien Headerdateien Headerdateien Headerdateien Headerdateien\GUI Headerdateien\GUI Headerdateien Headerdateien Headerdateien\GUI Headerdateien\GUI Headerdateien\GUI Headerdateien\GUI Ressourcendateien Ressourcendateien Ressourcendateien Ressourcendateien Ressourcendateien \ No newline at end of file diff --git a/Scylla/WindowDeferrer.cpp b/Scylla/WindowDeferrer.cpp deleted file mode 100644 index 5be182d..0000000 --- a/Scylla/WindowDeferrer.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "WindowDeferrer.h" - -WindowDeferrer::WindowDeferrer(HWND parent, const Deferrable* deferrables, size_t count) : parent(parent), deferrables(deferrables), count(count) -{ - hdwp = BeginDeferWindowPos(count); -} - -WindowDeferrer::~WindowDeferrer() -{ - EndDeferWindowPos(hdwp); -} - -bool WindowDeferrer::defer(int deltaX, int deltaY, HWND after) -{ - for(size_t i = 0; i < count; i++) - { - RECT rectControl; - HWND control = GetDlgItem(parent, deferrables[i].id); - - GetWindowRect(control, &rectControl); // Why doesn't GetClientRect work? - MapWindowPoints(HWND_DESKTOP, parent, (POINT*)&rectControl, 2); - - int x = rectControl.left; - int y = rectControl.top; - - // calculate new width and height - int cx = rectControl.right - rectControl.left; - int cy = rectControl.bottom - rectControl.top; - - if(deferrables[i].moveX) - x += deltaX; - if(deferrables[i].moveY) - y += deltaY; - if(deferrables[i].resizeX) - cx += deltaX; - if(deferrables[i].resizeY) - cy += deltaY; - - hdwp = DeferWindowPos(hdwp, control, after, x, y, cx, cy, (after ? 0 : SWP_NOZORDER) | SWP_NOACTIVATE | SWP_NOOWNERZORDER); - } - return true; -} diff --git a/Scylla/WindowDeferrer.h b/Scylla/WindowDeferrer.h deleted file mode 100644 index 1b0dd82..0000000 --- a/Scylla/WindowDeferrer.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include - -class WindowDeferrer -{ -public: - struct Deferrable - { - int id; - bool moveX; - bool moveY; - bool resizeX; - bool resizeY; - }; - - WindowDeferrer(HWND parent, const Deferrable* deferrables, size_t count); - ~WindowDeferrer(); - - bool defer(int deltaX, int deltaY, HWND after = NULL); - -private: - HWND parent; - const Deferrable* deferrables; - size_t count; - HDWP hdwp; -};