MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-205986 QuickDoc popup is not restored in the Editor from the Tool Window

Browse Source 
GitOrigin-RevId: ae2063cb5114326a65576c07992db3c3cd5bed43
This commit is contained in:
Dmitry Batrak
2019-10-02 10:07:03 +00:00
committed by intellij-monorepo-bot
parent 3ea3071d51
commit 716da17c25
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
+3 -3
View File
@@ -71,14 +71,14 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.text.DateFormatUtil;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.*;
import java.io.File;
import java.lang.ref.WeakReference;
import java.nio.file.Files;
@@ -174,8 +174,8 @@ public final class DocumentationManager extends DockablePopupManager<Documentati
super.restorePopupBehavior();
Component previouslyFocused = SoftReference.dereference(myFocusedBeforePopup);
if (previouslyFocused != null && previouslyFocused.isShowing()) {
UIUtil.runWhenFocused(previouslyFocused, () -> updateComponent(true));
IdeFocusManager.getInstance(myProject).requestFocus(previouslyFocused, true);
updateComponent(true);
}
}
platform/util/ui/src/com/intellij/util/ui/UIUtil.java
+31
View File
@@ -3815,4 +3815,35 @@ public final class UIUtil extends StartupUiUtil {
}
editor.scrollToReference(reference);
}
public static void runWhenFocused(@NotNull Component component, @NotNull Runnable runnable) {
assert component.isShowing();
if (component.isFocusOwner()) {
runnable.run();
}
else {
Disposable disposable = Disposer.newDisposable();
FocusListener focusListener = new FocusAdapter() {
@Override
public void focusGained(FocusEvent e) {
Disposer.dispose(disposable);
runnable.run();
}
};
HierarchyListener hierarchyListener = new HierarchyListener() {
@Override
public void hierarchyChanged(HierarchyEvent e) {
if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) != 0 && !component.isShowing()) {
Disposer.dispose(disposable);
}
}
};
component.addFocusListener(focusListener);
component.addHierarchyListener(hierarchyListener);
Disposer.register(disposable, () -> {
component.removeFocusListener(focusListener);
component.removeHierarchyListener(hierarchyListener);
});
}
}
}