From 2942598011eee1aeeebf0b25bbf02ba28cacac01 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 15 Dec 2023 17:32:27 +0300 Subject: =?UTF-8?q?fixes=20#4052=20(TabSRMM:=20=D0=BF=D1=80=D0=B8=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B6=D0=B0=D1=82=D0=B8=D0=B8=20F12=20=D0=B2=D1=81=D0=BF?= =?UTF-8?q?=D0=BB=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=20=D0=BF=D1=83=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BE=D0=B1=D0=BB=D0=B0=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BE=D0=BA=D0=BD=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/TabSRMM/src/buttonsbar.cpp | 4 ++-- plugins/TabSRMM/src/msgdialog.cpp | 23 ++++++----------------- 2 files changed, 8 insertions(+), 19 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp index 5914d944cf..a3d455615d 100644 --- a/plugins/TabSRMM/src/buttonsbar.cpp +++ b/plugins/TabSRMM/src/buttonsbar.cpp @@ -267,7 +267,7 @@ BOOL CMsgDialog::BB_SetButtonsPos() } else ShowWindow(hwndButton, SW_HIDE); - hdwp = DeferWindowPos(hdwp, hwndButton, nullptr, lwidth, splitterY - iOff, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + hdwp = DeferWindowPos(hdwp, hwndButton, nullptr, lwidth, splitterY - iOff - 2, 0, 0, SWP_NOZORDER | SWP_NOSIZE); if (IsWindowVisible(hwndButton) || (cbd->m_bSeparator && !(bAutoHidden || cbd->m_bHidden))) lwidth += cbd->m_iButtonWidth + gap; @@ -313,7 +313,7 @@ BOOL CMsgDialog::BB_SetButtonsPos() if (IsWindowVisible(hwndButton) || (cbd->m_bSeparator && !(bAutoHidden || cbd->m_bHidden))) rwidth += cbd->m_iButtonWidth + gap; - hdwp = DeferWindowPos(hdwp, hwndButton, nullptr, rect.right - foravatar - rwidth + gap, splitterY - iOff, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + hdwp = DeferWindowPos(hdwp, hwndButton, nullptr, rect.right - foravatar - rwidth + gap, splitterY - iOff - 2, 0, 0, SWP_NOZORDER | SWP_NOSIZE); mapHidden[cbd] = bAutoHidden; } diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 28c77dd810..7db8739e27 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -1286,35 +1286,24 @@ int CMsgDialog::Resizer(UTILRESIZECONTROL *urc) case IDC_LOGFROZENTEXT: urc->rcItem.right = urc->dlgNewSize.cx - 50; - urc->rcItem.bottom = m_rcMessage.top - (bBottomToolbar ? 0 : 28); - urc->rcItem.top = m_rcMessage.top - 16 - (bBottomToolbar ? 0 : 28); +LBL_Frozen: + urc->rcItem.bottom = m_rcMessage.top - 2 - (bBottomToolbar ? 0 : 28); + urc->rcItem.top = m_rcMessage.top - 18 - (bBottomToolbar ? 0 : 28); if (!bShowToolbar && !bBottomToolbar) { urc->rcItem.bottom += 21; urc->rcItem.top += 21; } - return RD_ANCHORX_CUSTOM | RD_ANCHORY_BOTTOM; + return RD_ANCHORX_CUSTOM | RD_ANCHORY_CUSTOM; case IDC_ADD: - urc->rcItem.bottom = m_rcMessage.top - (bBottomToolbar ? 0 : 28); - urc->rcItem.top = m_rcMessage.top - 18 - (bBottomToolbar ? 0 : 28); urc->rcItem.right = urc->dlgNewSize.cx - 28; urc->rcItem.left = urc->rcItem.right - 20; - if (!bShowToolbar && !bBottomToolbar) { - urc->rcItem.bottom += 21; - urc->rcItem.top += 21; - } - return RD_ANCHORX_CUSTOM | RD_ANCHORY_BOTTOM; + goto LBL_Frozen; case IDC_CANCELADD: - urc->rcItem.bottom = m_rcMessage.top - (bBottomToolbar ? 0 : 28); - urc->rcItem.top = m_rcMessage.top - 18 - (bBottomToolbar ? 0 : 28); urc->rcItem.right = urc->dlgNewSize.cx - 4; urc->rcItem.left = urc->rcItem.right - 20; - if (!bShowToolbar && !bBottomToolbar) { - urc->rcItem.bottom += 21; - urc->rcItem.top += 21; - } - return RD_ANCHORX_CUSTOM | RD_ANCHORY_BOTTOM; + goto LBL_Frozen; case IDC_TOGGLESIDEBAR: return RD_ANCHORX_CUSTOM | RD_ANCHORY_CUSTOM; -- cgit v1.2.3