From 007179cacafa72823a90ddfa549c5774af50c226 Mon Sep 17 00:00:00 2001
From: Clemens Zeidler <clemens.zeidler@googlemail.com>
Date: Mon, 18 Oct 2010 15:40:44 +0000
Subject: [PATCH] Use the mouse x position and the candidate tab top when
 searching for a stacking parent. I think this makes the stacking detection
 more intuitive. The candidate window is the dragged window and the parent
 window is the window that accept the SAT operation.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39003 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../decorators/SATDecorator/Stacking.cpp      | 32 ++++++++++++-------
 .../decorators/SATDecorator/Stacking.h        |  2 +-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/add-ons/decorators/SATDecorator/Stacking.cpp b/src/add-ons/decorators/SATDecorator/Stacking.cpp
index 6fbab98a56..56bbf167f5 100644
--- a/src/add-ons/decorators/SATDecorator/Stacking.cpp
+++ b/src/add-ons/decorators/SATDecorator/Stacking.cpp
@@ -203,7 +203,7 @@ StackingEventHandler::HandleMessage(SATWindow* sender,
 SATStacking::SATStacking(SATWindow* window)
 	:
 	fSATWindow(window),
-	fStackingCandidate(NULL)
+	fStackingParent(NULL)
 {
 	
 }
@@ -221,16 +221,24 @@ SATStacking::FindSnappingCandidates(SATGroup* group)
 	_ClearSearchResult();
 
 	Window* window = fSATWindow->GetWindow();
-	BPoint leftTop = window->Decorator()->TabRect().LeftTop();
+	if (!window->Decorator())
+		return false;
+
+	BPoint mousePosition;
+	int32 buttons;
+	fSATWindow->GetDesktop()->GetLastMouseState(&mousePosition, &buttons);
+	// use the upper edge of the candidate window to find the parent window
+	mousePosition.y = window->Decorator()->TabRect().top;
 
 	for (int i = 0; i < group->CountItems(); i++) {
 		SATWindow* satWindow = group->WindowAt(i);
-		// search for stacking candidate
+		// search for stacking parent
 		Window* win = satWindow->GetWindow();
-		if (win != window && win->Decorator()
-			&& win->Decorator()->TabRect().Contains(leftTop)) {
-			// remember window as the candidate for stacking
-			fStackingCandidate = satWindow;
+		if (win == window || !win->Decorator())
+			continue;
+		if (win->Decorator()->TabRect().Contains(mousePosition)) {
+			// remember window as the parent for stacking
+			fStackingParent = satWindow;
 			_HighlightWindows(true);
 			return true;
 		}
@@ -243,10 +251,10 @@ SATStacking::FindSnappingCandidates(SATGroup* group)
 bool
 SATStacking::JoinCandidates()
 {
-	if (!fStackingCandidate)
+	if (!fStackingParent)
 		return false;
 
-	bool result = fStackingCandidate->StackWindow(fSATWindow);
+	bool result = fStackingParent->StackWindow(fSATWindow);
 
 	_ClearSearchResult();
 	return result;
@@ -317,11 +325,11 @@ SATStacking::TabLocationMoved(float location, bool shifting)
 void
 SATStacking::_ClearSearchResult()
 {
-	if (!fStackingCandidate)
+	if (!fStackingParent)
 		return;
 
 	_HighlightWindows(false);
-	fStackingCandidate = NULL;
+	fStackingParent = NULL;
 }
 
 
@@ -331,7 +339,7 @@ SATStacking::_HighlightWindows(bool highlight)
 	Desktop* desktop = fSATWindow->GetWindow()->Desktop();
 	if (!desktop)
 		return;
-	fStackingCandidate->HighlightTab(highlight);
+	fStackingParent->HighlightTab(highlight);
 	fSATWindow->HighlightTab(highlight);
 }
 
diff --git a/src/add-ons/decorators/SATDecorator/Stacking.h b/src/add-ons/decorators/SATDecorator/Stacking.h
index 55457f3ce6..2e15785fbf 100644
--- a/src/add-ons/decorators/SATDecorator/Stacking.h
+++ b/src/add-ons/decorators/SATDecorator/Stacking.h
@@ -42,7 +42,7 @@ private:
 
 		SATWindow*			fSATWindow;
 
-		SATWindow*			fStackingCandidate;
+		SATWindow*			fStackingParent;
 };
 
 #endif