diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-12-15 17:32:27 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-12-15 17:32:27 +0300 |
| commit | 2942598011eee1aeeebf0b25bbf02ba28cacac01 (patch) | |
| tree | 929c917aaed1f1afe8401998074fdc2c6f1c7213 /plugins | |
| parent | b7876a1fbad586a5293f5ad2b18893b9e48d70c3 (diff) | |
fixes #4052 (TabSRMM: при нажатии F12 всплывает пустая область окна)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/TabSRMM/src/buttonsbar.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdialog.cpp | 23 |
2 files changed, 8 insertions, 19 deletions
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;
|