diff options
| author | George Hazan <ghazan@miranda.im> | 2023-03-20 19:07:29 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-03-20 19:07:29 +0300 |
| commit | 9b81a93de57785051cdb30bd7100a6102dd344be (patch) | |
| tree | 7e1ca7c1a38b7f5869ad59bb5deae1332343c845 | |
| parent | 00f13b022dbf89fd630a8d43ffd602c84caff7e9 (diff) | |
SRMM: button displays the forecoming state, not the current one
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgutils.cpp | 5 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdlgother.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/chat_window.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index b5ab5506ea..c7e0edcb05 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -491,7 +491,7 @@ void CMsgDialog::onClick_ShowList(CCtrlButton *pButton) return;
m_bNicklistEnabled = !m_bNicklistEnabled;
- pButton->SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST2 : IDI_NICKLIST));
+ UpdateFilterButton();
m_pLog->ScrollToBottom();
Resize();
}
diff --git a/plugins/Scriver/src/msgutils.cpp b/plugins/Scriver/src/msgutils.cpp index 7d659b85bd..4f7223c28d 100644 --- a/plugins/Scriver/src/msgutils.cpp +++ b/plugins/Scriver/src/msgutils.cpp @@ -534,7 +534,8 @@ void CMsgDialog::UpdateFilterButton() { CSuper::UpdateFilterButton(); - m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER2 : IDI_FILTER)); + m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER : IDI_FILTER2)); + m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST2 : IDI_NICKLIST)); } void CMsgDialog::UpdateNickList() @@ -558,8 +559,6 @@ void CMsgDialog::UpdateNickList() void CMsgDialog::UpdateOptions() { - m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST2 : IDI_NICKLIST)); - GetAvatar(); UpdateFilterButton(); diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp index b2e293ab74..1634e5712e 100644 --- a/plugins/TabSRMM/src/msgdlgother.cpp +++ b/plugins/TabSRMM/src/msgdlgother.cpp @@ -2489,7 +2489,7 @@ void CMsgDialog::UpdateFilterButton() {
CSuper::UpdateFilterButton();
- m_btnFilter.SendMsg(BUTTONSETOVERLAYICON, (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled), 0);
+ m_btnFilter.SendMsg(BUTTONSETOVERLAYICON, (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayDisabled : PluginConfig.g_iconOverlayEnabled), 0);
}
void CMsgDialog::UpdateNickList()
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp index 25d1be4f76..62572d5de1 100644 --- a/src/core/stdmsg/src/chat_window.cpp +++ b/src/core/stdmsg/src/chat_window.cpp @@ -46,7 +46,8 @@ void CMsgDialog::UpdateFilterButton() {
CSuper::UpdateFilterButton();
- m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER2 : IDI_FILTER));
+ m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER : IDI_FILTER2));
+ m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST : IDI_NICKLIST2, FALSE));
}
void CMsgDialog::UpdateNickList()
@@ -60,7 +61,6 @@ void CMsgDialog::UpdateNickList() void CMsgDialog::UpdateOptions()
{
- m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST2 : IDI_NICKLIST, FALSE));
UpdateFilterButton();
HICON hIcon = ImageList_GetIcon(Clist_GetImageList(), GetImageId(), ILD_TRANSPARENT);
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index d80148a7f5..94f32896df 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -299,7 +299,7 @@ void CMsgDialog::onClick_NickList(CCtrlButton *pButton) return;
m_bNicklistEnabled = !m_bNicklistEnabled;
- pButton->SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST2 : IDI_NICKLIST, FALSE));
+ UpdateFilterButton();
m_pLog->ScrollToBottom();
Resize();
|