You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2014/04/02 03:12:05 UTC
svn commit: r1583846 - in /pivot/trunk: ./
wtk/src/org/apache/pivot/wtk/Component.java
Author: rwhitcomb
Date: Wed Apr 2 01:12:05 2014
New Revision: 1583846
URL: http://svn.apache.org/r1583846
Log:
PIVOT-938: Further checks in the vein of PIVOT-927, where sometimes
the mouse location can be null. We still haven't quite figured out the
underlying cause, but guarding against a null pointer access seems to
work around the issue without causing too much harm.
This latest incarnation has to with displaying tooltips, where the
mouse location can also get to be null.
This is a merge of revision 1580958 from branches/2.0.x to trunk.
Modified:
pivot/trunk/ (props changed)
pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
Propchange: pivot/trunk/
------------------------------------------------------------------------------
Merged /pivot/branches/2.0.x:r1580958
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java?rev=1583846&r1=1583845&r2=1583846&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java Wed Apr 2 01:12:05 2014
@@ -2668,8 +2668,10 @@ public abstract class Component implemen
@Override
public void run() {
Point mouseLocationLocal = getMouseLocation();
- componentTooltipListeners.tooltipTriggered(Component.this,
- mouseLocationLocal.x, mouseLocationLocal.y);
+ if (mouseLocationLocal != null) {
+ componentTooltipListeners.tooltipTriggered(Component.this,
+ mouseLocationLocal.x, mouseLocationLocal.y);
+ }
}
}, tooltipDelay);