fixes #5009 ("Pin to desktop" option doesn't work in all modern Windows)

7 files changed, 12 insertions, 322 deletions

diff --git a/plugins/Clist_nicer/src/Docking.cpp b/plugins/Clist_nicer/src/Docking.cpp
deleted file mode 100644
index 71ba8ee99f..0000000000
--- a/plugins/Clist_nicer/src/Docking.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),

-Copyright (c) 2000-03 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#include "stdafx.h"

-

-#define WM_DOCKCALLBACK   (WM_USER+121)

-#define WM_CREATEDOCKED   (WM_USER+122)

-#define EDGESENSITIVITY   3

-

-#define DOCKED_NONE    0

-#define DOCKED_LEFT    1

-#define DOCKED_RIGHT   2

-int g_iDocked;

-

-extern RECT cluiPos;

-

-static void Docking_GetMonitorRectFromPoint(POINT pt, RECT *rc)

-{

-	MONITORINFO monitorInfo;

-	HMONITOR hMonitor = MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST); // always returns a valid value

-	monitorInfo.cbSize = sizeof(MONITORINFO);

-

-	if (GetMonitorInfo(hMonitor, &monitorInfo)) {

-		memcpy(rc, &monitorInfo.rcMonitor, sizeof(RECT));

-		return;

-	}

-

-	// "generic" win95/NT support, also serves as failsafe

-	rc->left = 0;

-	rc->top = 0;

-	rc->bottom = GetSystemMetrics(SM_CYSCREEN);

-	rc->right = GetSystemMetrics(SM_CXSCREEN);

-}

-

-static void Docking_GetMonitorRectFromWindow(HWND hWnd, RECT *rc)

-{

-	POINT ptWindow;

-	GetWindowRect(hWnd, rc);

-	ptWindow.x = rc->left;

-	ptWindow.y = rc->top;

-	Docking_GetMonitorRectFromPoint(ptWindow, rc);

-}

-

-static void Docking_AdjustPosition(HWND hwnd, RECT *rcDisplay, RECT *rc)

-{

-	APPBARDATA abd;

-

-	memset(&abd, 0, sizeof(abd));

-	abd.cbSize = sizeof(abd);

-	abd.hWnd = hwnd;

-	abd.uEdge = g_iDocked == DOCKED_LEFT ? ABE_LEFT : ABE_RIGHT;

-	abd.rc = *rc;

-	abd.rc.top = rcDisplay->top;

-	abd.rc.bottom = rcDisplay->bottom;

-	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;

-	}

-	else {

-		abd.rc.left = rcDisplay->right - (abd.rc.right - abd.rc.left) + cfg::dat.bClipBorder;

-		abd.rc.right = rcDisplay->right + cfg::dat.bClipBorder;

-	}

-	SHAppBarMessage(ABM_SETPOS, &abd);

-	*rc = abd.rc;

-}

-

-int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam)

-{

-	APPBARDATA abd;

-	static int draggingTitle;

-	MSG *msg = (MSG *)wParam;

-

-	if (msg->message == WM_DESTROY)

-		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) {

-	case WM_CREATE:

-		//if (GetSystemMetrics(SM_CMONITORS)>1) return 0;

-		if (g_plugin.getByte("Docked", 0))

-			PostMessage(msg->hwnd, WM_CREATEDOCKED, 0, 0);

-		draggingTitle = 0;

-		return 0;

-

-	case WM_CREATEDOCKED:

-		//we need to post a message just after creation to let main message function do some work

-		g_iDocked = (int)(char)g_plugin.getByte("Docked", 0);

-		if (IsWindowVisible(msg->hwnd) && !IsIconic(msg->hwnd)) {

-			RECT rc, rcMonitor;

-			memset(&abd, 0, sizeof(abd));

-			abd.cbSize = sizeof(abd);

-			abd.hWnd = msg->hwnd;

-			abd.lParam = 0;

-			abd.uCallbackMessage = WM_DOCKCALLBACK;

-			SHAppBarMessage(ABM_NEW, &abd);

-			GetWindowRect(msg->hwnd, &rc);

-			Docking_GetMonitorRectFromWindow(msg->hwnd, &rcMonitor);

-			Docking_AdjustPosition(msg->hwnd, &rcMonitor, &rc);

-			MoveWindow(msg->hwnd, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE);

-		}

-		break;

-

-	case WM_ACTIVATE:

-		memset(&abd, 0, sizeof(abd));

-		abd.cbSize = sizeof(abd);

-		abd.hWnd = msg->hwnd;

-		SHAppBarMessage(ABM_ACTIVATE, &abd);

-		return 0;

-

-	case WM_WINDOWPOSCHANGED:

-		memset(&abd, 0, sizeof(abd));

-		abd.cbSize = sizeof(abd);

-		abd.hWnd = msg->hwnd;

-		SHAppBarMessage(ABM_WINDOWPOSCHANGED, &abd);

-		return 0;

-

-	case WM_MOVING:

-		{

-			RECT rcMonitor;

-			POINT ptCursor;

-

-			// stop early

-			if (GetAsyncKeyState(VK_CONTROL) & 0x8000)

-				return 0;

-

-			// GetMessagePos() is no good, position is always unsigned

-			GetCursorPos(&ptCursor);

-			Docking_GetMonitorRectFromPoint(ptCursor, &rcMonitor);

-

-			if ((ptCursor.x < rcMonitor.left + EDGESENSITIVITY) || (ptCursor.x >= rcMonitor.right - EDGESENSITIVITY)) {

-				if (!(GetWindowLongPtr(msg->hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) {

-					SendMessage(msg->hwnd, CLUIINTM_REDRAW, 0, 0);

-					MessageBox(nullptr, TranslateT("The contact list cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead."),

-						TranslateT("Contact list docking"), MB_OK);

-					return 0;

-				}

-				memset(&abd, 0, sizeof(abd));

-				abd.cbSize = sizeof(abd);

-				abd.hWnd = msg->hwnd;

-				abd.lParam = 0;

-				abd.uCallbackMessage = WM_DOCKCALLBACK;

-				SHAppBarMessage(ABM_NEW, &abd);

-				if (ptCursor.x < rcMonitor.left + EDGESENSITIVITY)

-					g_iDocked = DOCKED_LEFT;

-				else

-					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);

-				PostMessage(msg->hwnd, CLUIINTM_REDRAW, 0, 0);

-				return TRUE;

-			}

-		}

-		return 0;

-

-	case WM_MOVE:

-		if (g_iDocked) {

-			RECT rc, rcMonitor;

-			Docking_GetMonitorRectFromWindow(msg->hwnd, &rcMonitor);

-			GetWindowRect(msg->hwnd, &rc);

-			Docking_AdjustPosition(msg->hwnd, &rcMonitor, &rc);

-			MoveWindow(msg->hwnd, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE);

-			return 1;

-		}

-		return 0;

-

-	case WM_SIZING:

-		{

-			RECT rcMonitor;

-			Docking_GetMonitorRectFromWindow(msg->hwnd, &rcMonitor);

-			Docking_AdjustPosition(msg->hwnd, &rcMonitor, (LPRECT)msg->lParam);

-			*((LRESULT *)lParam) = TRUE;

-		}

-		return TRUE;

-

-	case WM_SHOWWINDOW:

-		if (msg->lParam)

-			return 0;

-		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;

-		if (msg->wParam) {

-			RECT rc, rcMonitor;

-			Docking_GetMonitorRectFromWindow(msg->hwnd, &rcMonitor);

-			abd.lParam = 0;

-			abd.uCallbackMessage = WM_DOCKCALLBACK;

-			SHAppBarMessage(ABM_NEW, &abd);

-			GetWindowRect(msg->hwnd, &rc);

-			Docking_AdjustPosition(msg->hwnd, &rcMonitor, &rc);

-			MoveWindow(msg->hwnd, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, FALSE);

-		}

-		else SHAppBarMessage(ABM_REMOVE, &abd);

-		return 0;

-

-	case WM_NCHITTEST:

-		{

-			LONG result = DefWindowProc(msg->hwnd, WM_NCHITTEST, msg->wParam, msg->lParam);

-			if (result == HTSIZE || result == HTTOP || result == HTTOPLEFT || result == HTTOPRIGHT || result == HTBOTTOM || result == HTBOTTOMRIGHT || result == HTBOTTOMLEFT) {

-				*((LRESULT *)lParam) = HTCLIENT; return TRUE;

-			}

-			if (g_iDocked == DOCKED_LEFT && result == HTLEFT) {

-				*((LRESULT *)lParam) = HTCLIENT; return TRUE;

-			}

-			if (g_iDocked == DOCKED_RIGHT && result == HTRIGHT) {

-				*((LRESULT *)lParam) = HTCLIENT; return TRUE;

-			}

-		}

-		return 0;

-

-	case WM_SYSCOMMAND:

-		if ((msg->wParam & 0xFFF0) != SC_MOVE)

-			return 0;

-		SetActiveWindow(msg->hwnd);

-		SetCapture(msg->hwnd);

-		draggingTitle = 1;

-		*((LRESULT *)lParam) = 0;

-		return TRUE;

-

-	case WM_MOUSEMOVE:

-		if (!draggingTitle)

-			return 0; {

-			RECT rc;

-			POINT pt;

-			GetClientRect(msg->hwnd, &rc);

-			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);

-				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);

-			}

-		}

-		return 1;

-

-	case WM_LBUTTONUP:

-		if (draggingTitle) {

-			ReleaseCapture();

-			draggingTitle = 0;

-		}

-		return 0;

-

-	case WM_DOCKCALLBACK:

-		switch (msg->wParam) {

-		case ABN_WINDOWARRANGE:

-			ShowWindow(msg->hwnd, msg->lParam ? SW_HIDE : SW_SHOW);

-			break;

-		}

-		return TRUE;

-

-	case WM_DESTROY:

-		if (g_iDocked > 0) {

-			memset(&abd, 0, sizeof(abd));

-			abd.cbSize = sizeof(abd);

-			abd.hWnd = msg->hwnd;

-			SHAppBarMessage(ABM_REMOVE, &abd);

-		}

-		return 0;

-	}

-	return 0;

-}

diff --git a/plugins/Clist_nicer/src/clc.h b/plugins/Clist_nicer/src/clc.h
index 42af57eb1b..38bceff19f 100644
--- a/plugins/Clist_nicer/src/clc.h
+++ b/plugins/Clist_nicer/src/clc.h
@@ -422,9 +422,6 @@ void CluiProtocolStatusChanged(int, const char*);
 

 void LoadSkinItemToCache(struct TExtraCache *cEntry);

 

-// Docking.c

-extern int g_iDocked;

-

 // Buttons

 

 #define BUTTONSETIMLICON		(WM_USER+20)

diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index 1b8dca6242..fdc192cd6b 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -305,7 +305,6 @@ public:
 		CheckDlgButton(m_hwnd, IDC_ALWAYSHIDEONTASKBAR, g_plugin.getByte("AlwaysHideOnTB", 1) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(m_hwnd, IDC_FADEINOUT, cfg::dat.fadeinout ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(m_hwnd, IDC_DROPSHADOW, g_plugin.getByte("WindowShadow", 0) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(m_hwnd, IDC_ONDESKTOP, g_plugin.getByte("OnDesktop", 0) ? BST_CHECKED : BST_UNCHECKED);

 

 		chkAutoSize.SetState(cfg::dat.autosize);

 

@@ -446,7 +445,7 @@ public:
 		Clist::iAlpha = cfg::dat.alpha = SendDlgItemMessage(m_hwnd, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0);

 		Clist::iAutoAlpha = cfg::dat.autoalpha = SendDlgItemMessage(m_hwnd, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0);

 		g_plugin.setByte("WindowShadow", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_DROPSHADOW));

-		g_plugin.setByte("OnDesktop", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_ONDESKTOP));

+

 		db_set_dw(0, "CLUI", "Frameflags", cfg::dat.dwFlags);

 		cfg::dat.bFullTransparent = IsDlgButtonChecked(m_hwnd, IDC_FULLTRANSPARENT) ? 1 : 0;

 		db_set_b(0, "CLUI", "fulltransparent", (uint8_t)cfg::dat.bFullTransparent);

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 0cff6042ec..e662e6ba63 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -576,8 +576,6 @@ static void sttProcessResize(HWND hwnd, NMCLISTCONTROL *nmc)
 	if (!db_get_b(0, "CLUI", "AutoSize", 0))

 		return;

 

-	if (g_iDocked)

-		return;

 	if (hFrameContactTree == 0)

 		return;

 

@@ -948,15 +946,14 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 			}

 

 			if (cfg::dat.bClipBorder != 0 || cfg::dat.dwFlags & CLUI_FRAME_ROUNDEDFRAME) {

-				int docked = Clist_IsDocked();

 				int clip = cfg::dat.bClipBorder;

 

 				if (!g_CLUISkinnedBkColor)

 					FillRect(hdc, &rcClient, cfg::dat.hBrushColorKey);

 				if (cfg::dat.dwFlags & CLUI_FRAME_ROUNDEDFRAME)

-					rgn = CreateRoundRectRgn(clip, docked ? 0 : clip, rcClient.right - clip + 1, rcClient.bottom - (docked ? 0 : clip - 1), 8 + clip, 8 + clip);

+					rgn = CreateRoundRectRgn(clip, clip, rcClient.right - clip + 1, rcClient.bottom - (clip - 1), 8 + clip, 8 + clip);

 				else

-					rgn = CreateRectRgn(clip, docked ? 0 : clip, rcClient.right - clip, rcClient.bottom - (docked ? 0 : clip));

+					rgn = CreateRectRgn(clip, clip, rcClient.right - clip, rcClient.bottom - clip);

 				SelectClipRgn(hdc, rgn);

 			}

 

@@ -1034,9 +1031,6 @@ skipbg:
 		break;

 

 	case WM_WINDOWPOSCHANGED:

-		if (g_iDocked)

-			break;

-

 	case WM_WINDOWPOSCHANGING:

 		if (g_clistApi.hwndContactList != nullptr) {

 			WINDOWPOS *wp = (WINDOWPOS *)lParam;

@@ -1077,8 +1071,7 @@ skipbg:
 		return 0;

 

 	case WM_SIZE:

-		if ((wParam == 0 && lParam == 0) || g_iDocked) {

-

+		if (wParam == 0 && lParam == 0) {

 			if (IsZoomed(hwnd))

 				ShowWindow(hwnd, SW_SHOWNORMAL);

 

@@ -1099,22 +1092,18 @@ skipbg:
 	case WM_MOVE:

 		if (!IsIconic(hwnd)) {

 			GetWindowRect(hwnd, &rc);

-

-			if (!g_iDocked) {

-				cluiPos.bottom = (uint32_t)(rc.bottom - rc.top);

-				cluiPos.left = rc.left;

-				cluiPos.top = rc.top;

-			}

+			cluiPos.bottom = (uint32_t)(rc.bottom - rc.top);

+			cluiPos.left = rc.left;

+			cluiPos.top = rc.top;

 			cluiPos.right = rc.right - rc.left;

+

 			if (cfg::dat.realTimeSaving) {

 				GetWindowRect(hwnd, &rc);

 

 				// if docked, dont remember pos (except for width)

-				if (!Clist_IsDocked()) {

-					g_plugin.setDword("Height", (uint32_t)(rc.bottom - rc.top));

-					g_plugin.setDword("x", (uint32_t)rc.left);

-					g_plugin.setDword("y", (uint32_t)rc.top);

-				}

+				g_plugin.setDword("Height", (uint32_t)(rc.bottom - rc.top));

+				g_plugin.setDword("x", (uint32_t)rc.left);

+				g_plugin.setDword("y", (uint32_t)rc.top);

 				g_plugin.setDword("Width", (uint32_t)(rc.right - rc.left));

 			}

 		}

diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp
index 81d68a682e..9c09cec1f6 100644
--- a/plugins/Clist_nicer/src/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/cluiframes.cpp
@@ -1206,13 +1206,10 @@ INT_PTR CLUIFramesCollapseUnCollapseFrame(WPARAM wParam, LPARAM)
 

 	// do not collapse/uncollapse client/locked/invisible frames

 	if (Frames[FrameId].align == alClient && !(Frames[FrameId].Locked || (!Frames[FrameId].visible) || Frames[FrameId].floating)) {

-		RECT rc;

-		if (Clist_IsDocked())

-			return 0;

-

 		if (db_get_b(0, "CLUI", "AutoSize", 0))

 			return 0;

 

+		RECT rc;

 		GetWindowRect(g_clistApi.hwndContactList, &rc);

 

 		if (Frames[FrameId].collapsed == TRUE) {

diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index 4ec2a18cc0..2012338e90 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -34,7 +34,6 @@ CLIST_INTERFACE coreCli;
 

 extern HICON overlayicons[10];

 

-int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam);

 int SetHideOffline(int iValue);

 

 ClcContact *CreateClcContact(void);

@@ -176,7 +175,6 @@ int CMPlugin::Load()
 	g_clistApi.pfnCluiProtocolStatusChanged = CluiProtocolStatusChanged;

 	g_clistApi.pfnCompareContacts = CompareContacts;

 	g_clistApi.pfnCreateClcContact = CreateClcContact;

-	g_clistApi.pfnDocking_ProcessWindowMessage = Docking_ProcessWindowMessage;

 	g_clistApi.pfnGetContactHiddenStatus = CLVM_GetContactHiddenStatus;

 	g_clistApi.pfnGetDefaultFontSetting = GetDefaultFontSetting;

 	g_clistApi.pfnGetRowBottomY = RowHeight::getItemBottomY;

diff --git a/plugins/Clist_nicer/src/resource.h b/plugins/Clist_nicer/src/resource.h
index c67d6c1ceb..259646b7fc 100644
--- a/plugins/Clist_nicer/src/resource.h
+++ b/plugins/Clist_nicer/src/resource.h
@@ -193,7 +193,6 @@
 #define IDC_RELOAD                      1635

 #define IDC_IGN_ADDPERMANENTLY          1635

 #define IDC_DSP_LOADDEFAULT             1636

-#define IDC_ONDESKTOP                   1657

 #define IDC_WINCOLOUR                   1659

 #define IDC_APPLYLASTVIEWMODE           1661

 #define IDC_IGNORESELFORGROUPS          1722