From f7b2f8e71ad849f3409713be135111e032718d28 Mon Sep 17 00:00:00 2001 From: Vassiliy Kudryashov Date: Tue, 10 Apr 2012 17:16:53 +0400 Subject: [PATCH] Restore focus bugfixes --- .../src/com/intellij/ide/IdeTooltipManager.java | 7 ++++++- .../platform-impl/src/com/intellij/ui/LightweightHint.java | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java index 23620cd96f07..79febd3b419d 100644 --- a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java +++ b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java @@ -143,7 +143,12 @@ public class IdeTooltipManager implements ApplicationComponent, AWTEventListener if (!myCurrentTipIsCentered) { myX = me.getX(); myY = me.getY(); - + if (c instanceof JComponent && ((JComponent)c).getToolTipText(me) == null && (myQueuedTooltip == null || !myQueuedTooltip.isHint())) { + hideCurrent(me, null, null);//There is no tooltip or hint here, let's proceed it as MOUSE_EXITED + } + else { + maybeShowFor(c, me); + } } } } diff --git a/platform/platform-impl/src/com/intellij/ui/LightweightHint.java b/platform/platform-impl/src/com/intellij/ui/LightweightHint.java index 2c8382f40e79..895b38a61e3e 100644 --- a/platform/platform-impl/src/com/intellij/ui/LightweightHint.java +++ b/platform/platform-impl/src/com/intellij/ui/LightweightHint.java @@ -171,7 +171,8 @@ public class LightweightHint extends UserDataHolderBase implements Hint { .setFont(hintHint.getTextFont()) .setCalloutShift(hintHint.getCalloutShift()) .setPositionChangeShift(hintHint.getPositionChangeX(), hintHint.getPositionChangeY()) - .setExplicitClose(hintHint.isExplicitClose()); + .setExplicitClose(hintHint.isExplicitClose()) + .setHint(true); myComponent.validate(); myCurrentIdeTooltip = IdeTooltipManager.getInstance().show(tooltip, hintHint.isShowImmediately()); }