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-199367 IDE hangs when searching in Hebrew+English

Browse Source
This commit is contained in:
Mikhail Sokolov
2018-11-30 17:17:49 +03:00
parent 0ab2eb90c7
commit 7658e54e62
2 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/runAnything/RunAnythingManager.java
+19 -16
View File
@@ -3,6 +3,7 @@ package com.intellij.ide.actions.runAnything;
import com.intellij.ide.actions.BigPopupUI;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.JBPopup;
@@ -114,25 +115,27 @@ public class RunAnythingManager {
return;
}
Dimension minSize = myRunAnythingUI.getMinimumSize();
JBInsets.addTo(minSize, myBalloon.getContent().getInsets());
myBalloon.setMinimumSize(minSize);
ApplicationManager.getApplication().invokeLater(() -> {
Dimension minSize = myRunAnythingUI.getMinimumSize();
JBInsets.addTo(minSize, myBalloon.getContent().getInsets());
myBalloon.setMinimumSize(minSize);
if (viewType == BigPopupUI.ViewType.SHORT) {
myBalloonFullSize = myBalloon.getSize();
JBInsets.removeFrom(myBalloonFullSize, myBalloon.getContent().getInsets());
myBalloon.pack(false, true);
}
else {
if (myBalloonFullSize == null) {
myBalloonFullSize = myRunAnythingUI.getPreferredSize();
JBInsets.addTo(myBalloonFullSize, myBalloon.getContent().getInsets());
if (viewType == BigPopupUI.ViewType.SHORT) {
myBalloonFullSize = myBalloon.getSize();
JBInsets.removeFrom(myBalloonFullSize, myBalloon.getContent().getInsets());
myBalloon.pack(false, true);
}
myBalloonFullSize.height = Integer.max(myBalloonFullSize.height, minSize.height);
myBalloonFullSize.width = Integer.max(myBalloonFullSize.width, minSize.width);
else {
if (myBalloonFullSize == null) {
myBalloonFullSize = myRunAnythingUI.getPreferredSize();
JBInsets.addTo(myBalloonFullSize, myBalloon.getContent().getInsets());
}
myBalloonFullSize.height = Integer.max(myBalloonFullSize.height, minSize.height);
myBalloonFullSize.width = Integer.max(myBalloonFullSize.width, minSize.width);
myBalloon.setSize(myBalloonFullSize);
}
myBalloon.setSize(myBalloonFullSize);
}
});
});
return view;
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereManagerImpl.java
+18 -15
View File
@@ -5,6 +5,7 @@ import com.intellij.ide.actions.GotoActionBase;
import com.intellij.ide.util.gotoByName.SearchEverywhereConfiguration;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.JBPopup;
@@ -225,23 +226,25 @@ public class SearchEverywhereManagerImpl implements SearchEverywhereManager {
return;
}
Dimension minSize = mySearchEverywhereUI.getMinimumSize();
JBInsets.addTo(minSize, myBalloon.getContent().getInsets());
myBalloon.setMinimumSize(minSize);
ApplicationManager.getApplication().invokeLater(() -> {
Dimension minSize = mySearchEverywhereUI.getMinimumSize();
JBInsets.addTo(minSize, myBalloon.getContent().getInsets());
myBalloon.setMinimumSize(minSize);
if (viewType == SearchEverywhereUI.ViewType.SHORT) {
myBalloonFullSize = myBalloon.getSize();
JBInsets.removeFrom(myBalloonFullSize, myBalloon.getContent().getInsets());
myBalloon.pack(false, true);
} else {
if (myBalloonFullSize == null) {
myBalloonFullSize = mySearchEverywhereUI.getPreferredSize();
JBInsets.addTo(myBalloonFullSize, myBalloon.getContent().getInsets());
if (viewType == SearchEverywhereUI.ViewType.SHORT) {
myBalloonFullSize = myBalloon.getSize();
JBInsets.removeFrom(myBalloonFullSize, myBalloon.getContent().getInsets());
myBalloon.pack(false, true);
} else {
if (myBalloonFullSize == null) {
myBalloonFullSize = mySearchEverywhereUI.getPreferredSize();
JBInsets.addTo(myBalloonFullSize, myBalloon.getContent().getInsets());
}
myBalloonFullSize.height = Integer.max(myBalloonFullSize.height, minSize.height);
myBalloonFullSize.width = Integer.max(myBalloonFullSize.width, minSize.width);
myBalloon.setSize(myBalloonFullSize);
}
myBalloonFullSize.height = Integer.max(myBalloonFullSize.height, minSize.height);
myBalloonFullSize.width = Integer.max(myBalloonFullSize.width, minSize.width);
myBalloon.setSize(myBalloonFullSize);
}
});
});
DumbAwareAction.create(__ -> showHistoryItem(true))