diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-03-06 23:20:16 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-03-06 23:20:16 +0000 |
| commit | 052236c2ce0e28176d18cfdf08ac258cbf7600a1 (patch) | |
| tree | b780a7ddc14490d62b5d4fb214149f8d565e595d /plugins/Clist_modern/src/modern_clui.cpp | |
| parent | de82d806160c060dcca20968a0c788695d4459ab (diff) | |
Clist_modern:
- Minor cleanup
git-svn-id: http://svn.miranda-ng.org/main/trunk@12363 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src/modern_clui.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_clui.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index eb1551cfa8..4aa216fa8d 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) ? maxx = r1.right : x + 1;
- int maxy = (dat->MenuBmpUse & CLBF_TILEV) ? maxy = r1.bottom : y + 1;
+ int maxx = (dat->MenuBmpUse & CLBF_TILEH) ? r1.right : x + 1;
+ int maxy = (dat->MenuBmpUse & CLBF_TILEV) ? r1.bottom : y + 1;
switch (dat->MenuBmpUse & CLBM_TYPE) {
case CLB_STRETCH:
@@ -1726,8 +1726,7 @@ LRESULT CLUI::OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam) else if (msg == WM_WINDOWPOSCHANGING) {
// Snaping if it is not in LayeredMode
- WINDOWPOS * wp;
- wp = (WINDOWPOS *)lParam;
+ WINDOWPOS *wp = (WINDOWPOS *)lParam;
CLUI::SnappingToEdge(wp);
return DefWindowProc(m_hWnd, msg, wParam, lParam);
}
@@ -1829,14 +1828,6 @@ 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;
}
@@ -2419,10 +2410,7 @@ LRESULT CLUI::OnListSizeChangeNotify(NMCLISTCONTROL * pnmc) }
else bNeedFixSizingRect = 0;
- 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);
+ SetWindowPos(m_hWnd, 0, rcWindow.left, rcWindow.top, rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, SWP_NOZORDER | SWP_NOACTIVATE);
nRequiredHeight = 0;
|