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

find popup: don't blink with resize

Browse Source
This commit is contained in:
Sergey Ignatov
2016-05-19 00:53:22 +03:00
committed by Vassiliy.Kudryashov
parent 2c6caec768
commit 09ec9278df
1 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java
+12 -34
View File
@@ -72,7 +72,9 @@ import com.intellij.usages.Usage;
import com.intellij.usages.UsageInfo2UsageAdapter;
import com.intellij.usages.UsageViewPresentation;
import com.intellij.usages.impl.UsagePreviewPanel;
import com.intellij.util.*;
import com.intellij.util.Alarm;
import com.intellij.util.ArrayUtil;
import com.intellij.util.SmartList;
import com.intellij.util.ui.EmptyIcon;
import com.intellij.util.ui.JBFont;
import com.intellij.util.ui.JBUI;
@@ -103,6 +105,7 @@ public class FindPopupPanel extends JBPanel {
private static final Logger LOG = Logger.getInstance(FindPopupPanel.class);
// unify with CommonShortcuts.CTRL_ENTER
private static final KeyStroke OK_KEYSTROKE = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, SystemInfo.isMac
? InputEvent.META_DOWN_MASK
: InputEvent.CTRL_DOWN_MASK);
@@ -113,6 +116,7 @@ public class FindPopupPanel extends JBPanel {
private static final KeyStroke MOVE_CARET_DOWN_ALTERNATIVE = KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.ALT_DOWN_MASK);
private static final KeyStroke MOVE_CARET_UP_ALTERNATIVE = KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.ALT_DOWN_MASK);
private static final KeyStroke NEW_LINE_ALTERNATIVE = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.ALT_DOWN_MASK);
protected static final String SIZE_KEY = "find.popup";
private JComponent myCodePreviewComponent;
private SearchTextArea mySearchTextArea;
@@ -548,15 +552,6 @@ public class FindPopupPanel extends JBPanel {
closeAction.registerCustomShortcutSet(escape == null ? CommonShortcuts.ESCAPE : escape.getShortcutSet(), popup.getContent(), popup);
}
@Override
public void reshape(int x, int y, int w, int h) {
super.reshape(x, y, w, h);
if (myResultsPopup != null && myResultsPopup.isVisible()) {
adjustPopup();
}
}
@Override
public void addNotify() {
super.addNotify();
@@ -564,8 +559,6 @@ public class FindPopupPanel extends JBPanel {
myScopeSelectionToolbar.updateActionsImmediately();
}
private static final int POPUP_MAX_WIDTH = 600;
private void scheduleUpdateResultsPopupBounds() {
if (myUpdateResultsPopupBoundsAlarm == null || myUpdateResultsPopupBoundsAlarm.isDisposed()) return;
boolean later = myUpdateResultsPopupBoundsAlarm.getActiveRequestCount() > 0;
@@ -578,28 +571,7 @@ public class FindPopupPanel extends JBPanel {
if (myResultsPopup == null || !myResultsPopup.isVisible()) {
return;
}
Dimension size = myResultsPopup.getComponent().getPreferredSize();
if (size.width + 2 < getWidth()) {
size.width = getWidth();
}
Dimension sz = new Dimension(size.width, size.height);
if (!SystemInfo.isMac) {
if ((sz.width > POPUP_MAX_WIDTH || sz.height > POPUP_MAX_WIDTH)) {
final JBScrollPane pane = new JBScrollPane();
final int extraWidth = pane.getVerticalScrollBar().getWidth() + 1;
final int extraHeight = pane.getHorizontalScrollBar().getHeight() + 1;
sz = new Dimension(Math.min(POPUP_MAX_WIDTH, Math.max(getWidth(), sz.width + extraWidth)),
Math.min(POPUP_MAX_WIDTH, sz.height + extraHeight));
sz.width += 20;
sz.height += 2;
}
else {
sz.width += 2;
sz.height += 2;
}
}
myResultsPopup.setSize(sz);
adjustPopup();
myResultsPopup.setSize(myResultsPopup.getComponent().getPreferredSize());
}
private void adjustPopup() {
@@ -926,6 +898,7 @@ public class FindPopupPanel extends JBPanel {
.setCancelCallback(new Computable<Boolean>() {
@Override
public Boolean compute() {
DimensionService.getInstance().setSize(SIZE_KEY, myResultsPopup.getSize());
if (canClose.get()) return Boolean.TRUE;
Window activeWindow = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
Window balloonWindow = SwingUtilities.windowForComponent(myFindBalloon.getContent());
@@ -956,6 +929,11 @@ public class FindPopupPanel extends JBPanel {
RelativePoint point = new RelativePoint(FindPopupPanel.this, new Point(0, FindPopupPanel.this.getHeight()));
myResultsPopup.pack(true, true);
myResultsPopup.show(point);
Dimension panelSize = getPreferredSize();
Rectangle rectangle = ScreenUtil.getScreenRectangle(FindPopupPanel.this);
Dimension prev = DimensionService.getInstance().getSize(SIZE_KEY);
int width = prev != null && prev.width > panelSize.width ? prev.width : panelSize.width;
myResultsPopup.getComponent().setPreferredSize(new Dimension(width, (int)(rectangle.getHeight() * .6)));
Disposer.register(myDisposable, myResultsPopup);
registerCloseAction(myResultsPopup);
updateResultsPopupBounds();