From 1b1e6455fa79f2f6993115f9afbb506a5f93e315 Mon Sep 17 00:00:00 2001 From: Goraf <22941576+Goraf@users.noreply.github.com> Date: Fri, 3 Nov 2017 15:13:56 +0100 Subject: StartPostion: use base class * rewrite using classes * reduce globals * remove obsolete headers * code cleaning --- plugins/StartPosition/src/main.cpp | 75 ++++++++++++-------------------------- 1 file changed, 24 insertions(+), 51 deletions(-) (limited to 'plugins/StartPosition/src/main.cpp') diff --git a/plugins/StartPosition/src/main.cpp b/plugins/StartPosition/src/main.cpp index 8965ccffdb..1302faac10 100644 --- a/plugins/StartPosition/src/main.cpp +++ b/plugins/StartPosition/src/main.cpp @@ -23,77 +23,50 @@ along with this program. If not, see . #include "stdafx.h" + HINSTANCE g_hInst; int hLangpack; -StartPositionOptions spOptions; -ClistOptions clOptions; +StartPositionPlugin* startposition; PLUGININFOEX pluginInfo = { - sizeof(PLUGININFOEX), - __PLUGIN_NAME, - PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), - __DESCRIPTION, - __AUTHOR, - __AUTHOREMAIL, - __COPYRIGHT, - __AUTHORWEB, - UNICODE_AWARE, - // {211F6277-6F9B-4B77-A939-84D04B26B38C} - {0x211f6277, 0x6f9b, 0x4b77, {0xa9, 0x39, 0x84, 0xd0, 0x4b, 0x26, 0xb3, 0x8c}} + sizeof(PLUGININFOEX), + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, + // {211F6277-6F9B-4B77-A939-84D04B26B38C} + {0x211f6277, 0x6f9b, 0x4b77, {0xa9, 0x39, 0x84, 0xd0, 0x4b, 0x26, 0xb3, 0x8c}} }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { - g_hInst = hinstDLL; - return TRUE; + g_hInst = hinstDLL; + return TRUE; } extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { - return &pluginInfo; + return &pluginInfo; } extern "C" __declspec(dllexport) int Load(void) { - mir_getLP(&pluginInfo); - - RECT WorkArea; - SystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); - - if (spOptions.setClistStartState) - clOptions.state = static_cast(spOptions.clistState); - - if (spOptions.setClistWidth && spOptions.clistWidth > 0) - clOptions.width = static_cast(spOptions.clistWidth); - else - spOptions.clistWidth = static_cast(clOptions.width); - - if (spOptions.setTopPosition || spOptions.setBottomPosition || spOptions.setSidePosition) - clOptions.isDocked = false; + mir_getLP(&pluginInfo); + startposition = new StartPositionPlugin; - if (spOptions.setTopPosition) - clOptions.y = static_cast(spOptions.pixelsFromTop); + startposition->positionClist(); - if (spOptions.setBottomPosition) { - if (spOptions.setTopPosition) - clOptions.height = WorkArea.bottom - WorkArea.top - spOptions.pixelsFromTop - spOptions.pixelsFromBottom; - else - clOptions.y = WorkArea.bottom - spOptions.pixelsFromBottom - clOptions.height; - } - - if (spOptions.setSidePosition) { - if (spOptions.clistAlign == ClistAlign::right) - clOptions.x = WorkArea.right - spOptions.clistWidth - spOptions.pixelsFromSide; - else - clOptions.x = WorkArea.left + spOptions.pixelsFromSide; - } - - HookEvent(ME_OPT_INITIALISE, OptInitialise); - - return 0; + return 0; } extern "C" __declspec(dllexport) int Unload(void) { - return 0; + delete startposition; + startposition = nullptr; + + return 0; } -- cgit v1.2.3