commit 6e8cad34d38540e449d558bde41777ac3e9f62e8
author janeklb <janeklb> Wed Mar 29 20:33:47 2006 +0000
committer janeklb <janeklb> Wed Mar 29 20:33:47 2006 +0000
tree af5171a7d7decfecc38262b075be3734f4c29c73
parent edeefcd0b2f9c8bf7bd36b276b5ebf580136684a

Bug 123581 [Error Log] Tooltips stay open and steal focus

ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogView.java

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogView.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogView.java
index 82ec942..82bcf46 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogView.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogView.java
@@ -24,7 +24,6 @@
 import java.lang.reflect.InvocationTargetException;

 import java.text.Collator;

 import java.text.ParseException;

-import com.ibm.icu.text.SimpleDateFormat;

 import java.util.ArrayList;

 import java.util.Comparator;

 import java.util.Date;

@@ -73,6 +72,7 @@
 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.graphics.Point;

+import org.eclipse.swt.graphics.Rectangle;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.program.Program;

@@ -99,6 +99,8 @@
 import org.eclipse.ui.actions.ActionFactory;

 import org.eclipse.ui.part.ViewPart;

 

+import com.ibm.icu.text.SimpleDateFormat;

+

 public class LogView extends ViewPart implements ILogListener {

     public static final String P_LOG_WARNING = "warning"; //$NON-NLS-1$

     public static final String P_LOG_ERROR = "error"; //$NON-NLS-1$

@@ -886,12 +888,20 @@
             return;

         makeHoverShell();

         textLabel.setText(message);

-        int x = point.x + 5;

-        int y = point.y - (fTree.getItemHeight() * 2) - 20;

+        Rectangle bounds = fTree.getDisplay().getBounds();

+        Point cursorPoint = fTree.getDisplay().getCursorLocation();

+        int x = point.x;

+        int y = point.y + 25;

+        int width = fTree.getColumn(0).getWidth();

+        int height = 125;

+    	if (cursorPoint.x + width > bounds.width)

+    		x -= width;

+    	if (cursorPoint.y + height + 25 > bounds.height)

+    		y -= height + 27;

+        

         textShell.setLocation(fTree.toDisplay(x, y));

-        textShell.setSize(fTree.getColumn(0).getWidth(), 125);

-        textShell.open();

-        setFocus();

+        textShell.setSize(width, height);

+        textShell.setVisible(true);

     }

 

     void onMouseMove(Event e) {