mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-17 22:11:47 -06:00
feat: opens sole folder instead of upper folder after extraction; cancel folder priority over file in comparison; other minor ui fix
This commit is contained in:
@@ -506,6 +506,13 @@ void CPanel::OnDrag(LPNMLISTVIEW /* nmListView */)
|
||||
if (res == DRAGDROP_S_DROP)
|
||||
{
|
||||
res = dropSourceSpec->Result;
|
||||
/**
|
||||
Unmerged:
|
||||
|
||||
if (dataObjectSpec->m_Transfer.Target.Cmd_Type == NDragMenu::k_OpenArc) {
|
||||
need_Process = false;
|
||||
}
|
||||
*/
|
||||
if (dropSourceSpec->NeedPostCopy)
|
||||
if (!dataObjectSpec->Path.IsEmpty())
|
||||
{
|
||||
@@ -606,11 +613,6 @@ void CDropTarget::PositionCursor(POINTL ptl)
|
||||
{
|
||||
m_Panel = &App->Panels[i];
|
||||
m_IsAppTarget = false;
|
||||
if ((int)i == SrcPanelIndex)
|
||||
{
|
||||
m_PanelDropIsAllowed = false;
|
||||
return;
|
||||
}
|
||||
|
||||
POINT pt3 = pt;
|
||||
if (panel->ScreenToClient(&pt3)) {
|
||||
@@ -623,6 +625,12 @@ void CDropTarget::PositionCursor(POINTL ptl)
|
||||
m_IsPanelAddressComboBoxOrBar = true;
|
||||
}
|
||||
}
|
||||
|
||||
if ((int)i == SrcPanelIndex && !m_IsPanelAddressComboBoxOrBar)
|
||||
{
|
||||
m_PanelDropIsAllowed = false;
|
||||
return;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user