From 741732d2578caebd40446e221f5ee7f44330e907 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 5 Oct 2023 13:02:32 +0300 Subject: =?UTF-8?q?fixes=20#3701=20(tabSRMM:=20=D0=B2=20=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B5=20=D0=BA=D0=BD=D0=BE=D0=BF?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=BA=D1=80=D0=B8=D0=B2=D0=BE=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=D1=81=D1=82=D1=80=D0=BE=D1=87?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mir_app/src/srmm_toolbar.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp index 45450eaa26..72f64a935f 100644 --- a/src/mir_app/src/srmm_toolbar.cpp +++ b/src/mir_app/src/srmm_toolbar.cpp @@ -495,7 +495,10 @@ class CSrmmToolbarOptions : public CDlgBase tvis.item.iImage = tvis.item.iSelectedImage = 0; } else { - tvis.item.pszText = TranslateW(cbd->m_pwszTooltip); + if (cbd->m_pwszOptions) + tvis.item.pszText = TranslateW(cbd->m_pwszOptions); + else + tvis.item.pszText = TranslateW(cbd->m_pwszTooltip); tvis.item.iImage = tvis.item.iSelectedImage = ImageList_AddIcon(m_hImgl, IcoLib_GetIconByHandle(cbd->m_hIcon)); } cbd->m_opFlags = 0; @@ -724,6 +727,13 @@ MIR_APP_DLL(HANDLE) Srmm_AddButton(const BBButton *bbdi, HPLUGIN _hLang) cbd->m_pwszText = mir_wstrdup(bbdi->pwszText); cbd->m_pwszTooltip = mir_wstrdup(bbdi->pwszTooltip); + CMStringW wszText(cbd->m_pwszTooltip); + int idx = wszText.Find('\n'); + if (idx != -1) { + wszText.Truncate(idx); + cbd->m_pwszOptions = wszText.Detach(); + } + cbd->m_dwButtonID = bbdi->dwButtonID; cbd->m_hIcon = bbdi->hIcon; cbd->m_dwPosition = cbd->m_dwOrigPosition = bbdi->dwDefPos; -- cgit v1.2.3