Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Never choose a target pose in UpdateDropTarget() that is part of the currently

Browse Source 
dragged selection. This fixes the context menu popping up when you try to
  move around an icon a few pixels only.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36786 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2010-05-11 07:46:19 +00:00
parent 8ccc58ffa9
commit 9c8f23673b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/kits/tracker/PoseView.cpp
View File

@ -1732,7 +1732,7 @@ BPoseView::AddPoseToList(PoseList *list, bool visibleList, bool insertionSort,
if (viewBounds.Intersects(poseBounds))
SynchronousUpdate(poseBounds);
}
if (indexPtr)
*indexPtr = poseIndex;
}
@ -4637,7 +4637,7 @@ BPoseView::MoveSelectionInto(Model *destFolder, BContainerWindow *srcWindow,
return;
ASSERT(srcWindow->PoseView()->TargetModel());
if (srcWindow->PoseView()->SelectionList()->CountItems() == 0)
return;
@ -6184,7 +6184,7 @@ BPoseView::KeyDown(const char *bytes, int32 count)
SelectPose(pose, index);
break;
}
case B_FUNCTION_KEY:
case B_INSERT:
break;
@ -8962,11 +8962,14 @@ BPoseView::UpdateDropTarget(BPoint mouseLoc, const BMessage *dragMessage,
int32 index;
BPose *targetPose = FindPose(mouseLoc, &index);
if (targetPose != NULL && DragSelectionContains(targetPose, dragMessage))
targetPose = NULL;
if ((fCursorCheck && targetPose == fDropTarget)
|| (trackingContextMenu && !targetPose))
|| (trackingContextMenu && !targetPose)) {
// no change
return false;
}
fCursorCheck = true;
if (fDropTarget && !DragSelectionContains(fDropTarget, dragMessage))
@ -8980,7 +8983,8 @@ BPoseView::UpdateDropTarget(BPoint mouseLoc, const BMessage *dragMessage,
targetModel = targetPose->TargetModel();
Model tmpTarget;
if (targetModel && targetModel->IsSymLink()
&& tmpTarget.SetTo(targetPose->TargetModel()->EntryRef(), true, true) == B_OK)
&& tmpTarget.SetTo(targetPose->TargetModel()->EntryRef(), true, true)
== B_OK)
targetModel = &tmpTarget;
bool ignoreTypes = (modifiers() & B_CONTROL_KEY) != 0;
@ -9002,7 +9006,7 @@ BPoseView::UpdateDropTarget(BPoint mouseLoc, const BMessage *dragMessage,
entry_ref srcRef;
if (targetModel->IsDirectory() && dragMessage->HasRef("refs")
&& dragMessage->FindRef("refs", &srcRef) == B_OK) {
&& dragMessage->FindRef("refs", &srcRef) == B_OK) {
Model srcModel (&srcRef);
if (!CheckDevicesEqual(&srcRef, targetModel)
&& !srcModel.IsVolume()