diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-09-11 14:40:05 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-09-11 14:40:05 +0300 |
| commit | 2c2c6484dc2eb7b3da52f9054435dc680f64b132 (patch) | |
| tree | 687f2dba4be771b26d2fa97ceb4b99cadf5dc163 /src/mir_app | |
| parent | 61325c65c5b8549fbc05144ba533fe60ddd7853b (diff) | |
fixes #4650 (Окно сообщений: кнопки форматирования текста работают в приватах, но не в групчатах)
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/chat_svc.cpp | 5 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_base.cpp | 90 |
2 files changed, 35 insertions, 60 deletions
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp index b07278669d..368cdd51e0 100644 --- a/src/mir_app/src/chat_svc.cpp +++ b/src/mir_app/src/chat_svc.cpp @@ -178,11 +178,6 @@ MIR_APP_DLL(int) Chat_Register(const GCREGISTER *gcr) return GC_ERROR;
mi->ptszModDispName = mir_wstrdup(gcr->ptszDispName);
- mi->bBold = (gcr->dwFlags & GC_BOLD) != 0;
- mi->bUnderline = (gcr->dwFlags & GC_UNDERLINE) != 0;
- mi->bItalics = (gcr->dwFlags & GC_ITALICS) != 0;
- mi->bColor = (gcr->dwFlags & GC_COLOR) != 0;
- mi->bBkgColor = (gcr->dwFlags & GC_BKGCOLOR) != 0;
mi->bAckMsg = (gcr->dwFlags & GC_ACKMSG) != 0;
mi->bChanMgr = (gcr->dwFlags & GC_CHANMGR) != 0;
mi->bDatabase = (gcr->dwFlags & GC_DATABASE) != 0;
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index 3002622535..0317da383b 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -73,14 +73,9 @@ CSrmmBaseDialog::CSrmmBaseDialog(CMPluginBase &pPlugin, int idDialog, SESSION_IN if (si) {
m_hContact = si->hContact;
- if (si->pMI->bColor) {
- m_iFG = 4;
- m_bFGSet = true;
- }
- if (si->pMI->bBkgColor) {
- m_iBG = 2;
- m_bBGSet = true;
- }
+ m_iFG = 4;
+ m_iBG = 2;
+ m_bFGSet = m_bBGSet = true;
m_bFilterEnabled = db_get_b(m_hContact, CHAT_MODULE, "FilterEnabled", Chat::bFilterEnabled) != 0;
m_iLogFilterFlags = Chat::iFilterFlags;
@@ -689,11 +684,6 @@ void CSrmmBaseDialog::UpdateChatOptions() UpdateFilterButton();
MODULEINFO *mi = m_si->pMI;
- m_btnBold.Enable(mi->bBold);
- m_btnColor.Enable(mi->bColor);
- m_btnItalic.Enable(mi->bItalics);
- m_btnBkColor.Enable(mi->bBkgColor);
- m_btnUnderline.Enable(mi->bUnderline);
if (m_si->iType == GCW_CHATROOM)
m_btnChannelMgr.Enable(mi->bChanMgr);
@@ -1076,48 +1066,38 @@ void CSrmmBaseDialog::RefreshButtonStatus() cf.dwMask = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_BACKCOLOR | CFM_COLOR;
m_message.SendMsg(EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
- if (m_si->pMI->bColor) {
- bool bState = m_btnColor.IsPushed();
- if (!bState && cf.crTextColor != m_clrInputFG)
- m_btnColor.Push(true);
- else if (bState && cf.crTextColor == m_clrInputFG)
- m_btnColor.Push(false);
- }
-
- if (m_si->pMI->bBkgColor) {
- bool bState = m_btnBkColor.IsPushed();
- if (!bState && cf.crBackColor != m_clrInputBG)
- m_btnBkColor.Push(true);
- else if (bState && cf.crBackColor == m_clrInputBG)
- m_btnBkColor.Push(false);
- }
-
- if (m_si->pMI->bBold) {
- bool bState = m_btnBold.IsPushed();
- UINT u2 = cf.dwEffects & CFE_BOLD;
- if (!bState && u2 != 0)
- m_btnBold.Push(true);
- else if (bState && u2 == 0)
- m_btnBold.Push(false);
- }
-
- if (m_si->pMI->bItalics) {
- bool bState = m_btnItalic.IsPushed();
- UINT u2 = cf.dwEffects & CFE_ITALIC;
- if (!bState && u2 != 0)
- m_btnItalic.Push(true);
- else if (bState && u2 == 0)
- m_btnItalic.Push(false);
- }
-
- if (m_si->pMI->bUnderline) {
- bool bState = m_btnUnderline.IsPushed();
- UINT u2 = cf.dwEffects & CFE_UNDERLINE;
- if (!bState && u2 != 0)
- m_btnUnderline.Push(true);
- else if (bState && u2 == 0)
- m_btnUnderline.Push(false);
- }
+ bool bState = m_btnColor.IsPushed();
+ if (!bState && cf.crTextColor != m_clrInputFG)
+ m_btnColor.Push(true);
+ else if (bState && cf.crTextColor == m_clrInputFG)
+ m_btnColor.Push(false);
+
+ bState = m_btnBkColor.IsPushed();
+ if (!bState && cf.crBackColor != m_clrInputBG)
+ m_btnBkColor.Push(true);
+ else if (bState && cf.crBackColor == m_clrInputBG)
+ m_btnBkColor.Push(false);
+
+ bState = m_btnBold.IsPushed();
+ UINT u2 = cf.dwEffects & CFE_BOLD;
+ if (!bState && u2 != 0)
+ m_btnBold.Push(true);
+ else if (bState && u2 == 0)
+ m_btnBold.Push(false);
+
+ bState = m_btnItalic.IsPushed();
+ u2 = cf.dwEffects & CFE_ITALIC;
+ if (!bState && u2 != 0)
+ m_btnItalic.Push(true);
+ else if (bState && u2 == 0)
+ m_btnItalic.Push(false);
+
+ bState = m_btnUnderline.IsPushed();
+ u2 = cf.dwEffects & CFE_UNDERLINE;
+ if (!bState && u2 != 0)
+ m_btnUnderline.Push(true);
+ else if (bState && u2 == 0)
+ m_btnUnderline.Push(false);
}
void CSrmmBaseDialog::SetQuoteEvent(MEVENT hEvent)
|