From 4b7a566431243b3378db9fad866015d82088dce6 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 7 Mar 2015 07:58:11 +0000 Subject: rev. 12363 broke clist_modern skin loading, therefore is temporary reverted git-svn-id: http://svn.miranda-ng.org/main/trunk@12366 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_clui.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'plugins/Clist_modern/src/modern_clui.cpp') diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 4aa216fa8d..eb1551cfa8 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -1171,8 +1171,8 @@ static int CLUI_DrawMenuBackGround(HWND hwnd, HDC hdc, int item, int state) HDC hdcBmp = CreateCompatibleDC(hdc); HBITMAP oldbm = (HBITMAP)SelectObject(hdcBmp, dat->hMenuBackground); int y = clRect.top, x = clRect.left, destw, desth; - int maxx = (dat->MenuBmpUse & CLBF_TILEH) ? r1.right : x + 1; - int maxy = (dat->MenuBmpUse & CLBF_TILEV) ? r1.bottom : y + 1; + int maxx = (dat->MenuBmpUse & CLBF_TILEH) ? maxx = r1.right : x + 1; + int maxy = (dat->MenuBmpUse & CLBF_TILEV) ? maxy = r1.bottom : y + 1; switch (dat->MenuBmpUse & CLBM_TYPE) { case CLB_STRETCH: @@ -1726,7 +1726,8 @@ LRESULT CLUI::OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam) else if (msg == WM_WINDOWPOSCHANGING) { // Snaping if it is not in LayeredMode - WINDOWPOS *wp = (WINDOWPOS *)lParam; + WINDOWPOS * wp; + wp = (WINDOWPOS *)lParam; CLUI::SnappingToEdge(wp); return DefWindowProc(m_hWnd, msg, wParam, lParam); } @@ -1828,6 +1829,14 @@ LRESULT CLUI::OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam) SetProcessWorkingSetSize(GetCurrentProcess(), -1, -1); } return TRUE; + + case WM_WINDOWPOSCHANGING: + WINDOWPOS *wp = (WINDOWPOS *)lParam; + if (wp->flags&SWP_HIDEWINDOW && mutex_bAnimationInProgress) + return 0; + if (g_CluiData.fOnDesktop) + wp->flags |= SWP_NOACTIVATE | SWP_NOZORDER; + return DefWindowProc(m_hWnd, msg, wParam, lParam); } return 0; } @@ -2410,7 +2419,10 @@ LRESULT CLUI::OnListSizeChangeNotify(NMCLISTCONTROL * pnmc) } else bNeedFixSizingRect = 0; - SetWindowPos(m_hWnd, 0, rcWindow.left, rcWindow.top, rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, SWP_NOZORDER | SWP_NOACTIVATE); + if (!mutex_bDuringSizing) + SetWindowPos(m_hWnd, 0, rcWindow.left, rcWindow.top, rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, SWP_NOZORDER | SWP_NOACTIVATE); + else + SetWindowPos(m_hWnd, 0, rcWindow.left, rcWindow.top, rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, SWP_NOZORDER | SWP_NOACTIVATE); nRequiredHeight = 0; -- cgit v1.2.3