summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2023-11-23 12:23:06 +0300
committerGeorge Hazan <george.hazan@gmail.com>2023-11-23 12:23:10 +0300
commit7d881f05f60cfe4c56eb75ffba089168c6a371e3 (patch)
tree72c65b7dc8603579432db59422bd0b558ad6824f
parente0b71393adb6a90d278577d062655d0d9ebf616c (diff)
fixes #3950 (Плагины сообщений: скрывать больше неактуальных кнопок)
-rw-r--r--plugins/TabSRMM/src/buttonsbar.cpp2
-rw-r--r--plugins/TabSRMM/src/modplus.cpp2
-rw-r--r--src/mir_app/src/file.cpp2
-rw-r--r--src/mir_app/src/srmm_base.cpp5
4 files changed, 7 insertions, 4 deletions
diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index f8fd6e8a01..0093e56836 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -104,7 +104,7 @@ static int CB_InitDefaultButtons(WPARAM, LPARAM)
bbd.dwDefPos = 71;
g_plugin.addButton(&bbd);
- bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISPUSHBUTTON | BBBF_CREATEBYID;
+ bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISPUSHBUTTON | BBBF_CREATEBYID | BBBF_NOREADONLY;
bbd.dwButtonID = IDC_SRMM_COLOR;
bbd.pszModuleName = "Tabsrmm";
bbd.dwDefPos = 80;
diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp
index b938c3d543..8741333ad9 100644
--- a/plugins/TabSRMM/src/modplus.cpp
+++ b/plugins/TabSRMM/src/modplus.cpp
@@ -50,7 +50,7 @@ static wchar_t* getMenuEntry(int i)
static int RegisterCustomButton(WPARAM, LPARAM)
{
BBButton bbd = {};
- bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISPUSHBUTTON | BBBF_NOREADONLY;
+ bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISPUSHBUTTON | BBBF_NOREADONLY | BBBF_NOREADONLY;
bbd.dwButtonID = 1;
bbd.dwDefPos = 200;
bbd.hIcon = PluginConfig.g_buttonBarIconHandles[3];
diff --git a/src/mir_app/src/file.cpp b/src/mir_app/src/file.cpp
index 491a130183..6810acb103 100644
--- a/src/mir_app/src/file.cpp
+++ b/src/mir_app/src/file.cpp
@@ -167,7 +167,7 @@ static int SRFileModulesLoaded(WPARAM, LPARAM)
// SRMM toolbar button
BBButton bbd = {};
- bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON;
+ bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_NOREADONLY;
bbd.dwButtonID = 1;
bbd.dwDefPos = 50;
bbd.hIcon = g_plugin.getIconHandle(IDI_ATTACH);
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index 6647872d5e..025ae2466c 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -546,7 +546,10 @@ bool CSrmmBaseDialog::OnInitDialog()
SetWindowLongPtr(m_nickList.GetHwnd(), GWLP_USERDATA, LPARAM(this));
mir_subclassWindow(m_nickList.GetHwnd(), stubNicklistProc);
}
- else m_bNicklistEnabled = false;
+ else {
+ m_bNicklistEnabled = false;
+ m_btnNickList.Hide();
+ }
}
// three buttons below are initiated inside this call, so button creation must precede subclassing