From 6a2895b7cc2eabdd975ace83ce5dc5f8c0d6f88f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 2 Sep 2016 15:00:54 +0000 Subject: - three remaining clist services converted into functions (Clist_MenuProcessCommand, Clist_IsDocked, Clist_MenuProcessHotkey); - old unused junk removed from CLIST_INTERFACE with its stubs; - all unused clist services also removed with bunch of another crap like unused params git-svn-id: http://svn.miranda-ng.org/main/trunk@17243 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_clistmod.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Clist_modern/src/modern_clistmod.cpp') diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index d1786bb6a3..3c24073f87 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -318,14 +318,14 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY) BYTE g_bCalledFromShowHide = 0; -int cliShowHide(WPARAM, LPARAM lParam) +int cliShowHide(bool bAlwaysShow) { BOOL bShow = FALSE; int iVisibleState = GetWindowVisibleState(pcli->hwndContactList, 0, 0); int method = db_get_b(NULL, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT); //(0-none, 1-leftedge, 2-rightedge); if (method) { - if (db_get_b(NULL, "ModernData", "BehindEdge", SETTING_BEHINDEDGE_DEFAULT) == 0 && lParam != 1) + if (db_get_b(NULL, "ModernData", "BehindEdge", SETTING_BEHINDEDGE_DEFAULT) == 0 && !bAlwaysShow) CLUI_HideBehindEdge(); //hide else CLUI_ShowFromBehindEdge(); @@ -342,7 +342,7 @@ int cliShowHide(WPARAM, LPARAM lParam) db_unset(NULL, "ModernData", "BehindEdge"); } - //bShow is FALSE when we enter the switch if no hide behind edge. + // bShow is FALSE when we enter the switch if no hide behind edge. switch (iVisibleState) { case GWVS_PARTIALLY_COVERED: bShow = TRUE; break; @@ -356,7 +356,7 @@ int cliShowHide(WPARAM, LPARAM lParam) return 0; } - if (bShow || lParam == 1) { + if (bShow || bAlwaysShow) { Sync(CLUIFrames_ActivateSubContainers, TRUE); CLUI_ShowWindowMod(pcli->hwndContactList, SW_RESTORE); @@ -381,7 +381,7 @@ int cliShowHide(WPARAM, LPARAM lParam) MoveWindow(pcli->hwndContactList, rcWindow.left, rcWindow.top, rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, TRUE); } - else { //It needs to be hidden + else { // It needs to be hidden if (GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) { CListMod_HideWindow(); db_set_b(NULL, "CList", "State", SETTING_STATE_HIDDEN); -- cgit v1.2.3