From 90c45fe21858aabba06a6005949e803e5cca510e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 18 Apr 2024 20:49:07 +0300 Subject: =?UTF-8?q?fixes=20#4361=20(tabSRMML:=20=D1=81=D0=BB=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D1=81=D1=8C=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B5=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D1=80=D0=B0=20=D0=BE=D0=B1=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D0=B8=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/TabSRMM/src/generic_msghandlers.cpp | 14 +++++++------- plugins/TabSRMM/src/infopanel.cpp | 2 +- plugins/TabSRMM/src/msgdialog.cpp | 26 +++++++++++++------------- plugins/TabSRMM/src/msgdlgother.cpp | 18 +++++++++--------- plugins/TabSRMM/src/userprefs.cpp | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index 030053400e..4f965e728b 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -253,7 +253,7 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara LoadSplitter(); AdjustBottomAvatarDisplay(); DM_RecalcPictureSize(); - Resize(); + OnResize(); break; case ID_MODE_PRIVATE: @@ -262,7 +262,7 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara LoadSplitter(); AdjustBottomAvatarDisplay(); DM_RecalcPictureSize(); - Resize(); + OnResize(); break; case ID_GLOBAL_BBCODE: @@ -365,7 +365,7 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara RedrawWindow(m_hwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN); } m_pContainer->QueryClientArea(rc); - Resize(); + OnResize(); DM_ScrollToBottom(1, 1); Utils::showDlgControl(m_hwnd, IDC_MULTISPLITTER, (m_sendMode & SMODE_MULTIPLE) ? SW_SHOW : SW_HIDE); Utils::showDlgControl(m_hwnd, IDC_CLIST, (m_sendMode & SMODE_MULTIPLE) ? SW_SHOW : SW_HIDE); @@ -390,7 +390,7 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara if (!m_bIsAutosizingInput) { m_iSplitterSaved = m_iSplitterY; m_iSplitterY = rc.bottom / 2; - SendMessage(m_hwnd, WM_SIZE, 1, 1); + OnResize(); } ptrW wszText(db_get_wsa(m_hContact, "UserInfo", "MyNotes")); @@ -404,7 +404,7 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara if (!m_bIsAutosizingInput) { m_iSplitterY = m_iSplitterSaved; - Resize(); + OnResize(); DM_ScrollToBottom(0, 1); } } @@ -617,7 +617,7 @@ void CMsgDialog::DM_RecalcPictureSize() BITMAP bminfo; GetObject(hbm, sizeof(bminfo), &bminfo); if (CalcDynamicAvatarSize(&bminfo)) - Resize(); + OnResize(); } else m_pic.cy = m_pic.cx = 60; } @@ -988,7 +988,7 @@ int CMsgDialog::DM_SplitterGlobalEvent(WPARAM wParam, LPARAM lParam) LoadSplitter(); AdjustBottomAvatarDisplay(); DM_RecalcPictureSize(); - Resize(); + OnResize(); DM_ScrollToBottom(1, 1); if (this != srcDat) UpdateToolbarBG(); diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp index 2704436c87..af11e3e1bc 100644 --- a/plugins/TabSRMM/src/infopanel.cpp +++ b/plugins/TabSRMM/src/infopanel.cpp @@ -1204,7 +1204,7 @@ INT_PTR CALLBACK CInfoPanel::ConfigDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L } if (m_height != lOldHeight) { - ::SendMessage(m_dat->GetHwnd(), WM_SIZE, 0, 0); + m_dat->OnResize(); m_dat->m_pContainer->SetAeroMargins(); ::RedrawWindow(m_dat->GetHwnd(), nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW); ::RedrawWindow(GetParent(m_dat->GetHwnd()), nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW); diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 2a6f19486b..6cee6c70b6 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -147,7 +147,7 @@ void CMsgDialog::SetDialogToType() EnableSendButton(GetWindowTextLength(m_message.GetHwnd()) != 0); UpdateTitle(); - Resize(); + OnResize(); Utils::enableDlgControl(m_hwnd, IDC_CONTACTPIC, false); @@ -235,7 +235,7 @@ LRESULT CALLBACK SplitterSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM ReleaseCapture(); dat->DM_ScrollToBottom(0, 1); if (!dat->isChat() && hwnd == GetDlgItem(hwndParent, IDC_PANELSPLITTER)) { - SendMessage(hwndParent, WM_SIZE, 0, 0); + dat->OnResize(); RedrawWindow(hwndParent, nullptr, nullptr, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW); } else if (hwnd == GetDlgItem(hwndParent, IDC_SPLITTERY)) { @@ -298,7 +298,7 @@ LRESULT CALLBACK SplitterSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM dat->m_dynaSplitter = dat->m_savedDynaSplit; dat->DM_RecalcPictureSize(); dat->UpdateToolbarBG(); - SendMessage(hwndParent, WM_SIZE, 0, 0); + dat->OnResize(); dat->DM_ScrollToBottom(0, 1); break; } @@ -903,7 +903,7 @@ void CMsgDialog::onClick_Add(CCtrlButton*) ShowMultipleControls(m_hwnd, addControls, _countof(addControls), SW_HIDE); if (!m_bScrollingDisabled) Utils::showDlgControl(m_hwnd, IDC_LOGFROZENTEXT, SW_HIDE); - Resize(); + OnResize(); } } @@ -950,7 +950,7 @@ void CMsgDialog::onClick_CancelAdd(CCtrlButton*) ShowMultipleControls(m_hwnd, addControls, _countof(addControls), SW_HIDE); if (!m_bScrollingDisabled) Utils::showDlgControl(m_hwnd, IDC_LOGFROZENTEXT, SW_HIDE); - Resize(); + OnResize(); } void CMsgDialog::onClick_Filter(CCtrlButton *pButton) @@ -976,7 +976,7 @@ void CMsgDialog::onClick_ShowNickList(CCtrlButton *pButton) m_bNicklistEnabled = !m_bNicklistEnabled; - Resize(); + OnResize(); if (CSkin::m_skinEnabled) InvalidateRect(m_hwnd, nullptr, TRUE); m_pLog->ScrollToBottom(); @@ -1546,7 +1546,7 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter) HWND hwndEdit = m_message.GetHwnd(); SetWindowPos(hwndEdit, nullptr, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE); - Resize(); + OnResize(); RedrawWindow(hwndEdit, nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME | RDW_UPDATENOW | RDW_ERASE); DM_ScrollToBottom(0, 0); Utils::showDlgControl(m_hwnd, IDC_MULTISPLITTER, (m_sendMode & SMODE_MULTIPLE) ? SW_SHOW : SW_HIDE); @@ -1646,7 +1646,7 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter) SetDlgItemText(m_hwnd, IDC_LOGFROZENTEXT, TranslateT("Contact not on list. You may add it...")); else SetDlgItemText(m_hwnd, IDC_LOGFROZENTEXT, TranslateT("Auto scrolling is disabled (press F12 to enable it)")); - Resize(); + OnResize(); DM_ScrollToBottom(1, 1); return _dlgReturn(m_hwnd, 1); } @@ -2315,7 +2315,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) GetSendFormat(); SetDialogToType(); DM_RecalcPictureSize(); - Resize(); + OnResize(); DM_ScrollToBottom(0, 1); } return 0; @@ -2364,7 +2364,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) case DM_UPDATEPICLAYOUT: if (wParam == 0 || wParam == m_hContact) { LoadContactAvatar(); - Resize(); + OnResize(); } return 0; @@ -2429,7 +2429,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) MoveWindow(m_hwnd, rcClient.left, rcClient.top, (rcClient.right - rcClient.left), (rcClient.bottom - rcClient.top), TRUE); if (m_bWasBackgroundCreate) { m_bWasBackgroundCreate = false; - Resize(); + OnResize(); PostMessage(m_hwnd, DM_UPDATEPICLAYOUT, 0, 0); SetFocus(m_message.GetHwnd()); @@ -2437,7 +2437,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) m_pContainer->m_pSideBar->moveButtons(); } else { - Resize(); + OnResize(); if (lParam == 0) DM_ScrollToBottom(0, 1); } @@ -2730,7 +2730,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) m_pPanel.setHeight((LONG)lParam); } } - Resize(); + OnResize(); } return 0; diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp index 747af1f254..a296b2f32b 100644 --- a/plugins/TabSRMM/src/msgdlgother.cpp +++ b/plugins/TabSRMM/src/msgdlgother.cpp @@ -1355,7 +1355,7 @@ void CMsgDialog::LoadContactAvatar() if (!m_pPanel.isActive() || m_pContainer->cfg.avatarMode == 3) { m_iRealAvatarHeight = 0; - PostMessage(m_hwnd, WM_SIZE, 0, 0); + OnResize(); } else if (m_pPanel.isActive()) GetAvatarVisibility(); @@ -1385,7 +1385,7 @@ void CMsgDialog::LoadOwnAvatar() BITMAP bm; GetObject(m_hOwnPic, sizeof(bm), &bm); if (CalcDynamicAvatarSize(&bm)) - Resize(); + OnResize(); } } @@ -1703,7 +1703,7 @@ int CMsgDialog::MsgWindowMenuHandler(int selection, int menuId) } ShowPicture(false); - Resize(); + OnResize(); DM_ScrollToBottom(0, 1); return 1; @@ -2059,7 +2059,7 @@ void CMsgDialog::ShowPicture(bool showNewPic) if (!m_hwndPanelPic) { InvalidateRect(m_hwnd, nullptr, TRUE); UpdateWindow(m_hwnd); - Resize(); + OnResize(); } return; } @@ -2077,7 +2077,7 @@ void CMsgDialog::ShowPicture(bool showNewPic) if (!showNewPic) SetDialogToType(); else - Resize(); + OnResize(); } ///////////////////////////////////////////////////////////////////////////////////////// @@ -2167,7 +2167,7 @@ void CMsgDialog::ShowPopupMenu(const CCtrlBase &pCtrl, POINT pt) PluginConfig.m_visualMessageSizeIndicator = !PluginConfig.m_visualMessageSizeIndicator; db_set_b(0, SRMSGMOD_T, "msgsizebar", (uint8_t)PluginConfig.m_visualMessageSizeIndicator); Srmm_Broadcast(DM_CONFIGURETOOLBAR, 0, 0); - Resize(); + OnResize(); if (m_pContainer->m_hwndStatus) RedrawWindow(m_pContainer->m_hwndStatus, nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW); break; @@ -2201,7 +2201,7 @@ void CMsgDialog::SplitterMoved(int coord, HWND hwnd) if (m_iMultiSplit > ((rc.right - rc.left) - 80)) m_iMultiSplit = oldSplitterX; } - Resize(); + OnResize(); break; case IDC_SPLITTERX: @@ -2216,7 +2216,7 @@ void CMsgDialog::SplitterMoved(int coord, HWND hwnd) iSplitterX = rc.right - rc.left - 35; m_pContainer->cfg.iSplitterX = iSplitterX; } - Resize(); + OnResize(); break; case IDC_SPLITTERY: @@ -2253,7 +2253,7 @@ void CMsgDialog::SplitterMoved(int coord, HWND hwnd) } } UpdateToolbarBG(); - Resize(); + OnResize(); break; case IDC_PANELSPLITTER: diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp index 12f7e7b275..cb3533cf91 100644 --- a/plugins/TabSRMM/src/userprefs.cpp +++ b/plugins/TabSRMM/src/userprefs.cpp @@ -155,7 +155,7 @@ public: if (dat) { SendMessage(dat->GetHwnd(), DM_CONFIGURETOOLBAR, 0, 1); dat->ShowPicture(false); - dat->Resize(); + dat->OnResize(); dat->DM_ScrollToBottom(0, 1); } return true; -- cgit v1.2.3