From 652a115c1cef9a100765f2ad83d71075ae7b29c6 Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Mon, 12 Nov 2012 21:06:48 -0500
Subject: [PATCH] Use fDragRegion width not left, you can't depend on the
 screen position reliably

---
 src/apps/deskbar/BarView.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp
index 78bb6a3918..ded264be4c 100644
--- a/src/apps/deskbar/BarView.cpp
+++ b/src/apps/deskbar/BarView.cpp
@@ -492,9 +492,10 @@ TBarView::PlaceApplicationBar()
 		if (fBarMenuBar != NULL)
 			expandoFrame.left = fBarMenuBar->Frame().Width();
 
-		if (fTrayLocation != 0)
-			expandoFrame.right = fDragRegion->Frame().left - 1;
-		else
+		if (fTrayLocation != 0 && fDragRegion != NULL) {
+			expandoFrame.right = screenFrame.Width()
+				- fDragRegion->Frame().Width() - 1;
+		} else
 			expandoFrame.right = screenFrame.Width();
 
 		menuScrollFrame = expandoFrame;