fixes #3753 (Scriver: не видны последние сообщения)

4 files changed, 3 insertions, 13 deletions

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index af491bd4b0..fddd88cc6e 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -879,12 +879,7 @@ void CMsgDialog::OnOptionsApplied()
 		SendMessage(m_pContainer->m_hwnd, WM_SIZE, 0, 0);

 	InvalidateRect(m_message.GetHwnd(), nullptr, FALSE);

 

-	if (IsIconic(m_pContainer->m_hwnd))

-		m_bDeferredRemakeLog = true;

-	else if (isChat())

-		RedrawLog();

-	else

-		RemakeLog();

+	ScheduleRedrawLog();

 

 	ShowWindow(m_hwndPanelPicParent, SW_SHOW);

 	EnableWindow(m_hwndPanelPicParent, TRUE);

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index b135ec52bb..3362b32625 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -2370,7 +2370,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 	case DM_FORCEDREMAKELOG:

 		m_dwFlags &= ~(MWF_LOG_ALL);

 		m_dwFlags |= (lParam & MWF_LOG_ALL);

-		m_bDeferredRemakeLog = true;

+		ScheduleRedrawLog();

 		return 0;

 

 	case DM_APPENDMCEVENT:

diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 5f6a98e45b..e29dfdef75 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -2971,11 +2971,6 @@ void CMsgDialog::UpdateWindowState(UINT msg)
 		}

 		m_pContainer->cfg.flags.m_bNeedsUpdateTitle = false;

 

-		if (m_bDeferredRemakeLog && !IsIconic(m_pContainer->m_hwnd)) {

-			RemakeLog();

-			m_bDeferredRemakeLog = false;

-		}

-

 		if (m_bNeedCheckSize)

 			PostMessage(m_hwnd, DM_SAVESIZE, 0, 0);

 

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index c542919d86..0ac4ab7ea3 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -467,7 +467,7 @@ class CMsgDialog : public CSrmmBaseDialog
 	bool     m_fLimitedUpdate;

 	bool     m_bClrAdded;

 	bool     m_bInsertMode, m_bInitMode = true;

-	bool     m_bDeferredScroll, m_bDeferredRemakeLog;

+	bool     m_bDeferredScroll;

 	bool     m_bWasBackgroundCreate;

 

 	int      m_iRealAvatarHeight;