From 41403799d2c11dd86142f03f7b562c6e02ff8d00 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 9 May 2025 13:42:24 +0300 Subject: clist settings unification --- plugins/Clist_modern/src/modern_clc.h | 6 ----- plugins/Clist_modern/src/modern_defsettings.h | 12 --------- plugins/Clist_nicer/src/Docking.cpp | 37 ++++++++++++--------------- plugins/Clist_nicer/src/clc.h | 13 +--------- plugins/Clist_nicer/src/clui.cpp | 8 +++--- 5 files changed, 21 insertions(+), 55 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/src/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h index d45f96214f..ccefd45dc2 100644 --- a/plugins/Clist_modern/src/modern_clc.h +++ b/plugins/Clist_modern/src/modern_clc.h @@ -37,12 +37,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define NIIF_INTERN_UNICODE 0x00000100 -#define SETTING_STATE_HIDDEN 0 -#define SETTING_STATE_MINIMIZED 1 -#define SETTING_STATE_NORMAL 2 - -#define SETTING_BRINGTOFRONT_DEFAULT 0 - #define SETTING_AVATAR_OVERLAY_TYPE_NORMAL 0 #define SETTING_AVATAR_OVERLAY_TYPE_PROTOCOL 1 #define SETTING_AVATAR_OVERLAY_TYPE_CONTACT 2 diff --git a/plugins/Clist_modern/src/modern_defsettings.h b/plugins/Clist_modern/src/modern_defsettings.h index 47faefd940..469ae95f19 100644 --- a/plugins/Clist_modern/src/modern_defsettings.h +++ b/plugins/Clist_modern/src/modern_defsettings.h @@ -30,8 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #pragma once -#define SETTING_TOOLWINDOW_DEFAULT 1 -#define SETTING_ONTOP_DEFAULT 1 #define SETTING_MIN2TRAY_DEFAULT 1 #define SETTING_PLACEOFFLINETOROOT_DEFAULT 0 #define SETTING_THINBORDER_DEFAULT 0 @@ -41,9 +39,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SETTING_DISABLEWORKINGSET_DEFAULT 1 #define SETTING_ALWAYSVISICON_DEFAULT 0 -#define SETTING_SHOWMAINMENU_DEFAULT 1 -#define SETTING_SHOWCAPTION_DEFAULT 1 -#define SETTING_CLIENTDRAG_DEFAULT 1 #define SETTING_SHOWSBAR_DEFAULT 1 #define SETTING_SBARPERPROTO_DEFAULT 0 #define SETTING_USECONNECTINGICON_DEFAULT 1 @@ -188,13 +183,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SETTING_THIRDLINE_STATUSIFNOAWAY_DEFAULT 0 #define SETTING_THIRDLINE_LISTENINGIFNOAWAY_DEFAULT 0 -#define SETTING_TRANSPARENT_DEFAULT 0 -#define SETTING_AUTOALPHA_DEFAULT 150 -#define SETTING_AUTOHIDE_DEFAULT 0 -#define SETTING_HIDETIME_DEFAULT 30 -#define SETTING_CYCLETIME_DEFAULT 4 -#define SETTING_TRAYICON_DEFAULT SETTING_TRAYICON_SINGLE - #define SETTING_BLENDINACTIVESTATE_DEFAULT 0 #define CLCDEFAULT_MODERN_SELTEXTCOLOUR (g_CluiData.fDisableSkinEngine?GetSysColor(COLOR_HIGHLIGHTTEXT):RGB(0,0,128)) diff --git a/plugins/Clist_nicer/src/Docking.cpp b/plugins/Clist_nicer/src/Docking.cpp index 25be63e5b3..71ba8ee99f 100644 --- a/plugins/Clist_nicer/src/Docking.cpp +++ b/plugins/Clist_nicer/src/Docking.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define DOCKED_NONE 0 #define DOCKED_LEFT 1 #define DOCKED_RIGHT 2 -static int docked; +int g_iDocked; extern RECT cluiPos; @@ -69,11 +69,11 @@ static void Docking_AdjustPosition(HWND hwnd, RECT *rcDisplay, RECT *rc) memset(&abd, 0, sizeof(abd)); abd.cbSize = sizeof(abd); abd.hWnd = hwnd; - abd.uEdge = docked == DOCKED_LEFT ? ABE_LEFT : ABE_RIGHT; + abd.uEdge = g_iDocked == DOCKED_LEFT ? ABE_LEFT : ABE_RIGHT; abd.rc = *rc; abd.rc.top = rcDisplay->top; abd.rc.bottom = rcDisplay->bottom; - if (docked == DOCKED_LEFT) { + if (g_iDocked == DOCKED_LEFT) { abd.rc.right = rcDisplay->left + (abd.rc.right - abd.rc.left) - cfg::dat.bClipBorder; abd.rc.left = rcDisplay->left - cfg::dat.bClipBorder; } @@ -85,11 +85,6 @@ static void Docking_AdjustPosition(HWND hwnd, RECT *rcDisplay, RECT *rc) *rc = abd.rc; } -int Docking_IsDocked(WPARAM, LPARAM) -{ - return docked; -} - int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) { APPBARDATA abd; @@ -97,8 +92,8 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) MSG *msg = (MSG *)wParam; if (msg->message == WM_DESTROY) - g_plugin.setByte("Docked", (uint8_t)docked); - if (!docked && msg->message != WM_CREATE && msg->message != WM_MOVING && msg->message != WM_CREATEDOCKED && msg->message != WM_MOVE) + g_plugin.setByte("Docked", (uint8_t)g_iDocked); + if (!g_iDocked && msg->message != WM_CREATE && msg->message != WM_MOVING && msg->message != WM_CREATEDOCKED && msg->message != WM_MOVE) return 0; switch (msg->message) { @@ -111,7 +106,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) case WM_CREATEDOCKED: //we need to post a message just after creation to let main message function do some work - docked = (int)(char)g_plugin.getByte("Docked", 0); + g_iDocked = (int)(char)g_plugin.getByte("Docked", 0); if (IsWindowVisible(msg->hwnd) && !IsIconic(msg->hwnd)) { RECT rc, rcMonitor; memset(&abd, 0, sizeof(abd)); @@ -168,9 +163,9 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) abd.uCallbackMessage = WM_DOCKCALLBACK; SHAppBarMessage(ABM_NEW, &abd); if (ptCursor.x < rcMonitor.left + EDGESENSITIVITY) - docked = DOCKED_LEFT; + g_iDocked = DOCKED_LEFT; else - docked = DOCKED_RIGHT; + g_iDocked = DOCKED_RIGHT; SendMessage(msg->hwnd, WM_LBUTTONUP, 0, MAKELPARAM(ptCursor.x, ptCursor.y)); GetWindowRect(msg->hwnd, (LPRECT)msg->lParam); Docking_AdjustPosition(msg->hwnd, (LPRECT)&rcMonitor, (LPRECT)msg->lParam); @@ -181,7 +176,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) return 0; case WM_MOVE: - if (docked) { + if (g_iDocked) { RECT rc, rcMonitor; Docking_GetMonitorRectFromWindow(msg->hwnd, &rcMonitor); GetWindowRect(msg->hwnd, &rc); @@ -203,8 +198,8 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) case WM_SHOWWINDOW: if (msg->lParam) return 0; - if ((msg->wParam && docked < 0) || (!msg->wParam && docked > 0)) - docked = -docked; + if ((msg->wParam && g_iDocked < 0) || (!msg->wParam && g_iDocked > 0)) + g_iDocked = -g_iDocked; memset(&abd, 0, sizeof(abd)); abd.cbSize = sizeof(abd); abd.hWnd = msg->hwnd; @@ -227,10 +222,10 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) if (result == HTSIZE || result == HTTOP || result == HTTOPLEFT || result == HTTOPRIGHT || result == HTBOTTOM || result == HTBOTTOMRIGHT || result == HTBOTTOMLEFT) { *((LRESULT *)lParam) = HTCLIENT; return TRUE; } - if (docked == DOCKED_LEFT && result == HTLEFT) { + if (g_iDocked == DOCKED_LEFT && result == HTLEFT) { *((LRESULT *)lParam) = HTCLIENT; return TRUE; } - if (docked == DOCKED_RIGHT && result == HTRIGHT) { + if (g_iDocked == DOCKED_RIGHT && result == HTRIGHT) { *((LRESULT *)lParam) = HTCLIENT; return TRUE; } } @@ -251,14 +246,14 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) RECT rc; POINT pt; GetClientRect(msg->hwnd, &rc); - if (((docked == DOCKED_LEFT || docked == -DOCKED_LEFT) && (short)LOWORD(msg->lParam) > rc.right) || ((docked == DOCKED_RIGHT || docked == -DOCKED_RIGHT) && (short)LOWORD(msg->lParam) < 0)) { + if (((g_iDocked == DOCKED_LEFT || g_iDocked == -DOCKED_LEFT) && (short)LOWORD(msg->lParam) > rc.right) || ((g_iDocked == DOCKED_RIGHT || g_iDocked == -DOCKED_RIGHT) && (short)LOWORD(msg->lParam) < 0)) { ReleaseCapture(); draggingTitle = 0; memset(&abd, 0, sizeof(abd)); abd.cbSize = sizeof(abd); abd.hWnd = msg->hwnd; SHAppBarMessage(ABM_REMOVE, &abd); - docked = 0; + g_iDocked = 0; GetCursorPos(&pt); PostMessage(msg->hwnd, WM_NCLBUTTONDOWN, HTCAPTION, MAKELPARAM(pt.x, pt.y)); SetWindowPos(msg->hwnd, nullptr, pt.x - rc.right / 2, pt.y - GetSystemMetrics(SM_CYFRAME) - GetSystemMetrics(SM_CYSMCAPTION) / 2, cluiPos.right, cluiPos.bottom, SWP_NOZORDER); @@ -282,7 +277,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) return TRUE; case WM_DESTROY: - if (docked > 0) { + if (g_iDocked > 0) { memset(&abd, 0, sizeof(abd)); abd.cbSize = sizeof(abd); abd.hWnd = msg->hwnd; diff --git a/plugins/Clist_nicer/src/clc.h b/plugins/Clist_nicer/src/clc.h index 418d04dddf..42af57eb1b 100644 --- a/plugins/Clist_nicer/src/clc.h +++ b/plugins/Clist_nicer/src/clc.h @@ -423,8 +423,7 @@ void CluiProtocolStatusChanged(int, const char*); void LoadSkinItemToCache(struct TExtraCache *cEntry); // Docking.c - -int Docking_IsDocked(WPARAM wParam, LPARAM lParam); +extern int g_iDocked; // Buttons @@ -442,16 +441,6 @@ int CoolSB_SetupScrollBar(); #define SETTING_WINDOWSTYLE_DEFAULT 0 -#define SETTING_TRAYICON_SINGLE 0 -#define SETTING_TRAYICON_CYCLE 1 -#define SETTING_TRAYICON_MULTI 2 - -#define SETTING_STATE_HIDDEN 0 -#define SETTING_STATE_MINIMIZED 1 -#define SETTING_STATE_NORMAL 2 - -#define SETTING_BRINGTOFRONT_DEFAULT 0 - #define SETTING_WINDOWSTYLE_TOOLWINDOW 1 #define SETTING_WINDOWSTYLE_THINBORDER 2 #define SETTING_WINDOWSTYLE_NOBORDER 3 diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index ec4fbb0404..29682c4f65 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -576,7 +576,7 @@ static void sttProcessResize(HWND hwnd, NMCLISTCONTROL *nmc) if (!db_get_b(0, "CLUI", "AutoSize", 0)) return; - if (Docking_IsDocked(0, 0)) + if (g_iDocked) return; if (hFrameContactTree == 0) return; @@ -1034,7 +1034,7 @@ skipbg: break; case WM_WINDOWPOSCHANGED: - if (Docking_IsDocked(0, 0)) + if (g_iDocked) break; case WM_WINDOWPOSCHANGING: @@ -1077,7 +1077,7 @@ skipbg: return 0; case WM_SIZE: - if ((wParam == 0 && lParam == 0) || Docking_IsDocked(0, 0)) { + if ((wParam == 0 && lParam == 0) || g_iDocked) { if (IsZoomed(hwnd)) ShowWindow(hwnd, SW_SHOWNORMAL); @@ -1100,7 +1100,7 @@ skipbg: if (!IsIconic(hwnd)) { GetWindowRect(hwnd, &rc); - if (!Docking_IsDocked(0, 0)) { + if (!g_iDocked) { cluiPos.bottom = (uint32_t)(rc.bottom - rc.top); cluiPos.left = rc.left; cluiPos.top = rc.top; -- cgit v1.2.3