From d765974505c971a73de6fc6c0b615915ce3f0282 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 15 Nov 2023 17:10:52 +0300 Subject: =?UTF-8?q?fixes=20#3927=20(=D0=A3=D0=B1=D1=80=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20=D1=87=D1=83=D0=B2=D1=81=D1=82=D0=B2=D0=B8=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BA=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B3=D0=B8=D1=81=D1=82=D1=80=D1=83=20=D0=B2=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=B5=20NotesReminders)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/NotesAndReminders/src/reminders.cpp | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index 895ae9af79..9759e1873b 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -1526,9 +1526,11 @@ class CReminderListDlg : public CDlgBase int i = 0; for (auto &pReminder : arReminders) { - if (!m_wszFilter.IsEmpty()) - if (pReminder->wszText.Find(m_wszFilter, 0) == -1) + if (!m_wszFilter.IsEmpty()) { + CMStringW str = pReminder->wszText; + if (str.MakeLower().Find(m_wszFilter, 0) == -1) continue; + } LV_ITEM lvTIt; lvTIt.mask = LVIF_TEXT | LVIF_PARAM; @@ -1628,6 +1630,18 @@ public: pListDialog = nullptr; } + void OnResize() override + { + CSuper::OnResize(); + + RECT rc; + GetWindowRect(m_list.GetHwnd(), &rc); + int nWidth = rc.right - rc.left - m_list.GetColumnWidth(0) - 4; + if (GetWindowLong(m_list.GetHwnd(), GWL_STYLE) & WS_VSCROLL) + nWidth -= GetSystemMetrics(SM_CXVSCROLL); + m_list.SetColumnWidth(1, nWidth); + } + int Resizer(UTILRESIZECONTROL *urc) override { switch (urc->wId) { @@ -1728,6 +1742,7 @@ public: void onChange_Filter(CCtrlEdit *) { m_wszFilter = ptrW(edtFilter.GetText()); + m_wszFilter.MakeLower(); RefreshList(); } @@ -1745,16 +1760,6 @@ public: } } break; - - case WM_SIZE: - CSuper::DlgProc(msg, wParam, lParam); - - GetWindowRect(m_list.GetHwnd(), &rc); - int nWidth = rc.right - rc.left - m_list.GetColumnWidth(0) - 4; - if (GetWindowLong(m_list.GetHwnd(), GWL_STYLE) & WS_VSCROLL) - nWidth -= GetSystemMetrics(SM_CXVSCROLL); - m_list.SetColumnWidth(1, nWidth); - return 0; } return CSuper::DlgProc(msg, wParam, lParam); -- cgit v1.2.3