diff options
| author | George Hazan <ghazan@miranda.im> | 2016-12-21 21:49:26 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2016-12-21 21:49:26 +0300 |
| commit | 8cb1ffbb71529abb9462aeab3fe9758618eefc5e (patch) | |
| tree | c159dd9a3bdf5a231ace9df40f5de02fa46718dc | |
| parent | 44940ce8d48f254cb956f25ed641534239a07742 (diff) | |
fixes #657 (Settings -> Icons -> Import icons" don't work)
| -rw-r--r-- | src/mir_app/src/skin2opts.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mir_app/src/skin2opts.cpp b/src/mir_app/src/skin2opts.cpp index cf866a8743..b3bc632dfa 100644 --- a/src/mir_app/src/skin2opts.cpp +++ b/src/mir_app/src/skin2opts.cpp @@ -896,17 +896,18 @@ INT_PTR CIconImportDlg::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) }
ImageList_DragMove(dragX, dragY);
- if (hwndOver == m_preview.GetHwnd()) {
- ScreenToClient(m_preview.GetHwnd(), &lvhti.pt);
+ CCtrlListView &mainList = m_pParent->m_preview;
+ if (hwndOver == mainList.GetHwnd()) {
+ ScreenToClient(mainList.GetHwnd(), &lvhti.pt);
- if (m_preview.HitTest(&lvhti) != -1) {
+ if (mainList.HitTest(&lvhti) != -1) {
if (lvhti.iItem != m_iDropHiLite) {
ImageList_DragLeave(m_hwndDragOver);
if (m_iDropHiLite != -1)
- m_preview.SetItemState(m_iDropHiLite, 0, LVIS_DROPHILITED);
+ mainList.SetItemState(m_iDropHiLite, 0, LVIS_DROPHILITED);
m_iDropHiLite = lvhti.iItem;
- m_preview.SetItemState(m_iDropHiLite, LVIS_DROPHILITED, LVIS_DROPHILITED);
- UpdateWindow(m_preview.GetHwnd());
+ mainList.SetItemState(m_iDropHiLite, LVIS_DROPHILITED, LVIS_DROPHILITED);
+ UpdateWindow(mainList.GetHwnd());
ImageList_DragEnter(m_hwndDragOver, dragX, dragY);
}
onItem = 1;
@@ -915,8 +916,8 @@ INT_PTR CIconImportDlg::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) if (!onItem && m_iDropHiLite != -1) {
ImageList_DragLeave(m_hwndDragOver);
- m_preview.SetItemState(m_iDropHiLite, 0, LVIS_DROPHILITED);
- UpdateWindow(m_preview.GetHwnd());
+ mainList.SetItemState(m_iDropHiLite, 0, LVIS_DROPHILITED);
+ UpdateWindow(mainList.GetHwnd());
ImageList_DragEnter(m_hwndDragOver, dragX, dragY);
m_iDropHiLite = -1;
}
|