* Slight renamings, no functional changes.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42442 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
29769e0452
commit
df1c9e984e
@ -3788,19 +3788,19 @@ BContainerWindow::SaveWindowState(BMessage &message) const
|
||||
|
||||
|
||||
status_t
|
||||
BContainerWindow::DragStart(const BMessage *incoming)
|
||||
BContainerWindow::DragStart(const BMessage* dragMessage)
|
||||
{
|
||||
if (incoming == NULL)
|
||||
if (dragMessage == NULL)
|
||||
return B_ERROR;
|
||||
|
||||
// if already dragging, or
|
||||
// if all the refs match
|
||||
if (Dragging() && SpringLoadedFolderCompareMessages(incoming, fDragMessage))
|
||||
if (Dragging() && SpringLoadedFolderCompareMessages(dragMessage, fDragMessage))
|
||||
return B_OK;
|
||||
|
||||
// cache the current drag message
|
||||
// build a list of the mimetypes in the message
|
||||
SpringLoadedFolderCacheDragData(incoming, &fDragMessage, &fCachedTypesList);
|
||||
SpringLoadedFolderCacheDragData(dragMessage, &fDragMessage, &fCachedTypesList);
|
||||
|
||||
fWaitingForRefs = true;
|
||||
|
||||
|
@ -6704,12 +6704,12 @@ BPoseView::_EndSelectionRect()
|
||||
|
||||
|
||||
void
|
||||
BPoseView::MouseMoved(BPoint mouseLoc, uint32 moveCode, const BMessage *message)
|
||||
BPoseView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage)
|
||||
{
|
||||
if (fSelectionRectInfo.isDragging)
|
||||
_UpdateSelectionRect(mouseLoc);
|
||||
_UpdateSelectionRect(where);
|
||||
|
||||
if (!fDropEnabled || message == NULL)
|
||||
if (!fDropEnabled || dragMessage == NULL)
|
||||
return;
|
||||
|
||||
BContainerWindow* window = ContainerWindow();
|
||||
@ -6717,12 +6717,12 @@ BPoseView::MouseMoved(BPoint mouseLoc, uint32 moveCode, const BMessage *message)
|
||||
return;
|
||||
|
||||
if (!window->Dragging())
|
||||
window->DragStart(message);
|
||||
window->DragStart(dragMessage);
|
||||
|
||||
switch (moveCode) {
|
||||
switch (transit) {
|
||||
case B_INSIDE_VIEW:
|
||||
case B_ENTERED_VIEW:
|
||||
UpdateDropTarget(mouseLoc, message, window->ContextMenu());
|
||||
UpdateDropTarget(where, dragMessage, window->ContextMenu());
|
||||
if (fAutoScrollState == kAutoScrollOff) {
|
||||
// turn on auto scrolling if it's not yet on
|
||||
fAutoScrollState = kWaitForTransition;
|
||||
|
Loading…
Reference in New Issue
Block a user