diff options
| -rw-r--r-- | include/m_srmm_int.h | 2 | ||||
| -rw-r--r-- | libs/win32/mir_app.lib | bin | 300256 -> 300552 bytes | |||
| -rw-r--r-- | libs/win64/mir_app.lib | bin | 300296 -> 300596 bytes | |||
| -rw-r--r-- | plugins/Scriver/src/msgs.h | 1 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgutils.cpp | 5 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/generic_msghandlers.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdlgother.cpp | 5 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 5 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgs.h | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_base.cpp | 5 |
12 files changed, 13 insertions, 15 deletions
diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h index 92e265ea96..d860704cac 100644 --- a/include/m_srmm_int.h +++ b/include/m_srmm_int.h @@ -376,7 +376,7 @@ public: virtual bool IsActive() const = 0;
virtual void LoadSettings() = 0;
virtual void OnOptionsApplied();
- virtual void RemakeLog() = 0;
+ virtual void RemakeLog();
virtual void SetStatusText(const wchar_t *, HICON) {}
virtual void ShowFilterMenu() {}
virtual void UpdateFilterButton();
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib Binary files differindex d38bea4acc..1025bad8c7 100644 --- a/libs/win32/mir_app.lib +++ b/libs/win32/mir_app.lib diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib Binary files differindex b77bc8357f..c51beade5a 100644 --- a/libs/win64/mir_app.lib +++ b/libs/win64/mir_app.lib diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h index 0cf7a9ad6a..d98d8709ff 100644 --- a/plugins/Scriver/src/msgs.h +++ b/plugins/Scriver/src/msgs.h @@ -133,7 +133,6 @@ public: void GetInputFont(LOGFONTW &lf, COLORREF &bg, COLORREF &fg) const override;
void LoadSettings() override;
void OnOptionsApplied() override;
- void RemakeLog() override;
void SetStatusText(const wchar_t *, HICON) override;
void ShowFilterMenu() override;
void UpdateFilterButton() override;
diff --git a/plugins/Scriver/src/msgutils.cpp b/plugins/Scriver/src/msgutils.cpp index 275b56e1fe..a0ac86aa08 100644 --- a/plugins/Scriver/src/msgutils.cpp +++ b/plugins/Scriver/src/msgutils.cpp @@ -399,11 +399,6 @@ void CMsgDialog::Reattach(HWND hwndContainer) } } -void CMsgDialog::RemakeLog() -{ - m_pLog->LogEvents(m_hDbEventFirst, -1, 0); -} - void CMsgDialog::SetDialogToType() { if (!isChat()) { diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index 1dde4270ea..12f4643670 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -541,7 +541,7 @@ void CMsgDialog::DM_ScrollToBottom(WPARAM wParam, LPARAM lParam) m_bDeferredScroll = true;
if (m_iLogMode == WANT_BUILTIN_LOG)
- ((CLogWindow *)m_pLog)->ScrollToBottom(wParam != 0, lParam != 0);
+ LOG()->ScrollToBottom(wParam != 0, lParam != 0);
else
m_pLog->ScrollToBottom();
}
diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp index f9d345a4d8..10fcd4b601 100644 --- a/plugins/TabSRMM/src/msgdlgother.cpp +++ b/plugins/TabSRMM/src/msgdlgother.cpp @@ -1548,7 +1548,10 @@ void CMsgDialog::RemakeLog() m_szMicroLf[0] = 0;
m_lastEventTime = 0;
m_iLastEventType = -1;
- StreamEvents(m_hDbEventFirst, -1, 0);
+
+ CSuper::RemakeLog();
+
+ DM_ScrollToBottom(0, 0);
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index a549fae3e2..32d226af31 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -1345,11 +1345,6 @@ void CMsgDialog::NotifyTyping(int mode) }
}
-void CMsgDialog::RemakeLog()
-{
- m_pLog->LogEvents(m_hDbEventFirst, -1, false);
-}
-
void CMsgDialog::ShowTime(bool bForce)
{
if (!m_hTimeZone)
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index dba435e123..9e72103eac 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -140,7 +140,6 @@ public: bool IsActive() const override;
void LoadSettings() override;
void OnOptionsApplied() override;
- void RemakeLog() override;
void SetStatusText(const wchar_t *, HICON) override;
void ShowFilterMenu() override;
void UpdateFilterButton() override;
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 1f7e1d1728..79529d5e42 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -991,3 +991,4 @@ _Proto_CanDeleteHistory@8 @1124 NONAME ?InsertBbcodeString@CSrmmBaseDialog@@IAEXPB_W@Z @1129 NONAME
?markRead@SESSION_INFO@@QAEX_N@Z @1130 NONAME
?Srmm_NotifyRemoteRead@@YGXII@Z @1131 NONAME
+?RemakeLog@CSrmmBaseDialog@@UAEXXZ @1132 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index ef42406121..0614b964f7 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -991,3 +991,4 @@ Proto_CanDeleteHistory @1118 NONAME ?InsertBbcodeString@CSrmmBaseDialog@@IEAAXPEB_W@Z @1123 NONAME
?markRead@SESSION_INFO@@QEAAX_N@Z @1124 NONAME
?Srmm_NotifyRemoteRead@@YAXII@Z @1125 NONAME
+?RemakeLog@CSrmmBaseDialog@@UEAAXXZ @1126 NONAME
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index e1916826dd..7c727c4bef 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -763,6 +763,11 @@ void CSrmmBaseDialog::OnRedrawTimer(CTimer *pTimer) RemakeLog();
}
+void CSrmmBaseDialog::RemakeLog()
+{
+ m_pLog->LogEvents(m_hDbEventFirst, -1, false);
+}
+
void CSrmmBaseDialog::ScheduleRedrawLog()
{
timerRedraw.Start(20);
|