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

* Slight renamings, no functional changes.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42442 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexandre Deckner 2011-07-17 10:31:50 +00:00
parent 29769e0452
commit df1c9e984e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kits/tracker/ContainerWindow.cpp
View File

@ -3788,19 +3788,19 @@ BContainerWindow::SaveWindowState(BMessage &message) const
status_t status_t
BContainerWindow::DragStart(const BMessage *incoming) BContainerWindow::DragStart(const BMessage* dragMessage)
{ {
if (incoming == NULL) if (dragMessage == NULL)
return B_ERROR; return B_ERROR;
// if already dragging, or // if already dragging, or
// if all the refs match // if all the refs match
if (Dragging() && SpringLoadedFolderCompareMessages(incoming, fDragMessage)) if (Dragging() && SpringLoadedFolderCompareMessages(dragMessage, fDragMessage))
return B_OK; return B_OK;
// cache the current drag message // cache the current drag message
// build a list of the mimetypes in the message // build a list of the mimetypes in the message
SpringLoadedFolderCacheDragData(incoming, &fDragMessage, &fCachedTypesList); SpringLoadedFolderCacheDragData(dragMessage, &fDragMessage, &fCachedTypesList);
fWaitingForRefs = true; fWaitingForRefs = true;

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

@ -6704,12 +6704,12 @@ BPoseView::_EndSelectionRect()
void void
BPoseView::MouseMoved(BPoint mouseLoc, uint32 moveCode, const BMessage *message) BPoseView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage)
{ {
if (fSelectionRectInfo.isDragging) if (fSelectionRectInfo.isDragging)
_UpdateSelectionRect(mouseLoc); _UpdateSelectionRect(where);
if (!fDropEnabled || message == NULL) if (!fDropEnabled || dragMessage == NULL)
return; return;
BContainerWindow* window = ContainerWindow(); BContainerWindow* window = ContainerWindow();
@ -6717,12 +6717,12 @@ BPoseView::MouseMoved(BPoint mouseLoc, uint32 moveCode, const BMessage *message)
return; return;
if (!window->Dragging()) if (!window->Dragging())
window->DragStart(message); window->DragStart(dragMessage);
switch (moveCode) { switch (transit) {
case B_INSIDE_VIEW: case B_INSIDE_VIEW:
case B_ENTERED_VIEW: case B_ENTERED_VIEW:
UpdateDropTarget(mouseLoc, message, window->ContextMenu()); UpdateDropTarget(where, dragMessage, window->ContextMenu());
if (fAutoScrollState == kAutoScrollOff) { if (fAutoScrollState == kAutoScrollOff) {
// turn on auto scrolling if it's not yet on // turn on auto scrolling if it's not yet on
fAutoScrollState = kWaitForTransition; fAutoScrollState = kWaitForTransition;