ASSIGNED - bug 280973: [mac] Tooltip not shown when Tasklist is scrolled

https://bugs.eclipse.org/bugs/show_bug.cgi?id=280973

2 files changed, 6 insertions, 10 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java
index 13958ac97..db14107d9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java
@@ -144,12 +144,4 @@ public class PlatformUtil {
 	public static boolean hasNarrowToolBar() {
 		return Platform.WS_WIN32.equals(SWT.getPlatform());
 	}
-
-	/**
-	 * On Cocoa the bounds from an TreeViewer are handed in the way that scrolling did not change them. So when you have
-	 * initial not visible Element the bound of them are outside of the TreeViewer control
-	 */
-	public static boolean needsTreeItemBoundsFix() {
-		return "cocoa".equals(SWT.getPlatform()); //$NON-NLS-1$
-	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java
index a4fff011b..2e773c777 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java
@@ -428,8 +428,12 @@ public class TaskListToolTip extends GradientToolTip {
 				Rectangle bounds = getBounds(tipWidget);
 				if (tipWidget instanceof ScalingHyperlink) {
 					currentTipElement = getTaskListElement(tipWidget);
-				} else if (PlatformUtil.needsTreeItemBoundsFix()
-						|| (bounds != null && control.getBounds().contains(bounds.x, bounds.y))) {
+				} else if (tipWidget instanceof TreeItem) {
+					Tree tree = ((TreeItem) tipWidget).getParent();
+					if ((bounds != null && tree.getClientArea().contains(bounds.x, bounds.y))) {
+						currentTipElement = getTaskListElement(tipWidget);
+					}
+				} else if ((bounds != null && control.getBounds().contains(bounds.x, bounds.y))) {
 					currentTipElement = getTaskListElement(tipWidget);
 				}
 			}