diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
index fb9ab5fb903d..e0755312ca65 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
@@ -33,6 +33,7 @@ import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.ex.AnActionListener;
import com.intellij.openapi.actionSystem.ex.CustomComponentAction;
import com.intellij.openapi.actionSystem.impl.ActionManagerImpl;
+import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl;
import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.actions.TextComponentEditorAction;
@@ -99,8 +100,8 @@ import java.util.concurrent.atomic.AtomicLong;
*/
public class SearchEverywhereAction extends AnAction implements CustomComponentAction, DumbAware{
public static final int SEARCH_FIELD_COLUMNS = 25;
- private final SearchEverywhereAction.MyListRenderer myRenderer;
- private final JPanel myContentPanel;
+ private SearchEverywhereAction.MyListRenderer myRenderer;
+// private JPanel myContentPanel;
SearchTextField field;
SearchTextField myPopupField;
private GotoClassModel2 myClassModel;
@@ -192,13 +193,14 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
private JBPopup myBalloon;
- private JLabel mySearchLabel;
+// private JLabel mySearchLabel;
private int myPopupActualWidth;
private Component myFocusOwner;
private ChooseByNamePopup myFileChooseByName;
- public SearchEverywhereAction() {
- myContentPanel = new JPanel(new BorderLayout()) {
+ @Override
+ public JComponent createCustomComponent(Presentation presentation) {
+ JPanel panel = new JPanel(new BorderLayout()) {
@Override
protected void paintComponent(Graphics g) {
if (myBalloon != null && !myBalloon.isDisposed() && myActionEvent != null && myActionEvent.getInputEvent() == null) {
@@ -210,57 +212,99 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
}
};
- myContentPanel.setOpaque(false);
- myList.setOpaque(false);
- mySearchLabel = new JBLabel(AllIcons.Actions.FindPlain) {
+ panel.setOpaque(false);
+
+ final JLabel label = new JBLabel(AllIcons.Actions.FindPlain) {
{
enableEvents(AWTEvent.MOUSE_EVENT_MASK);
enableEvents(AWTEvent.MOUSE_MOTION_EVENT_MASK);
}
};
- myContentPanel.add(mySearchLabel, BorderLayout.CENTER);
- initTooltip();
- mySearchLabel.addMouseListener(new MouseAdapter() {
+ panel.add(label, BorderLayout.CENTER);
+ initTooltip(label);
+ label.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
if (myBalloon != null) {
myBalloon.cancel();
}
myFocusOwner = IdeFocusManager.findInstance().getFocusOwner();
- mySearchLabel.setToolTipText(null);
+ label.setToolTipText(null);
IdeTooltipManager.getInstance().hideCurrentNow(false);
- mySearchLabel.setIcon(AllIcons.Actions.FindWhite);
- actionPerformed(null);
-// mySearchLabel.setIcon(AllIcons.Actions.FindPlain);
-// myContentPanel.remove(mySearchLabel);
-// field.getTextEditor().setColumns(SEARCH_FIELD_COLUMNS);
-// myContentPanel.add(field, BorderLayout.CENTER);
-// field.setOpaque(false);
-// myContentPanel.setOpaque(false);
-// JComponent parent = UIUtil.getParentOfType(Box.class, myContentPanel);
-// if (parent == null) {
-// parent = (JComponent)myContentPanel.getParent().getParent();
-// }
-// parent.revalidate();
-// parent.repaint();
-// IdeFocusManager.findInstanceByComponent(field.getTextEditor()).requestFocus(field.getTextEditor(), true);
+ label.setIcon(AllIcons.Actions.FindWhite);
+ actionPerformed(null, e);
}
@Override
public void mouseEntered(MouseEvent e) {
if (myBalloon == null || myBalloon.isDisposed()) {
- mySearchLabel.setIcon(AllIcons.Actions.Find);
+ label.setIcon(AllIcons.Actions.Find);
}
}
@Override
public void mouseExited(MouseEvent e) {
if (myBalloon == null || myBalloon.isDisposed()) {
- mySearchLabel.setIcon(AllIcons.Actions.FindPlain);
+ label.setIcon(AllIcons.Actions.FindPlain);
}
}
});
+ return panel;
+ }
+
+
+ public SearchEverywhereAction() {
+// myContentPanel = new JPanel(new BorderLayout()) {
+// @Override
+// protected void paintComponent(Graphics g) {
+// if (myBalloon != null && !myBalloon.isDisposed() && myActionEvent != null && myActionEvent.getInputEvent() == null) {
+// ((Graphics2D)g).setPaint(new GradientPaint(0,0, new JBColor(new Color(101, 136, 242), new Color(16, 91, 180)), 0, getHeight(),
+// new JBColor(new Color(44, 96, 238), new Color(16, 80, 147))));
+// g.fillRect(0,0,getWidth(), getHeight());
+// } else {
+// super.paintComponent(g);
+// }
+// }
+// };
+// myContentPanel.setOpaque(false);
+// myList.setOpaque(false);
+// mySearchLabel = new JBLabel(AllIcons.Actions.FindPlain) {
+// {
+// enableEvents(AWTEvent.MOUSE_EVENT_MASK);
+// enableEvents(AWTEvent.MOUSE_MOTION_EVENT_MASK);
+// }
+// };
+// myContentPanel.add(mySearchLabel, BorderLayout.CENTER);
+//// initTooltip(label);
+// mySearchLabel.addMouseListener(new MouseAdapter() {
+// @Override
+// public void mousePressed(MouseEvent e) {
+// if (myBalloon != null) {
+// myBalloon.cancel();
+// }
+// myFocusOwner = IdeFocusManager.findInstance().getFocusOwner();
+// mySearchLabel.setToolTipText(null);
+// IdeTooltipManager.getInstance().hideCurrentNow(false);
+// mySearchLabel.setIcon(AllIcons.Actions.FindWhite);
+// actionPerformed(null);
+// }
+//
+// @Override
+// public void mouseEntered(MouseEvent e) {
+// if (myBalloon == null || myBalloon.isDisposed()) {
+// mySearchLabel.setIcon(AllIcons.Actions.Find);
+// }
+// }
+//
+// @Override
+// public void mouseExited(MouseEvent e) {
+// if (myBalloon == null || myBalloon.isDisposed()) {
+// mySearchLabel.setIcon(AllIcons.Actions.FindPlain);
+// }
+// }
+// });
+//
createSearchField();
LafManager.getInstance().addLafManagerListener(new LafManagerListener() {
@Override
@@ -289,8 +333,8 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
- private void initTooltip() {
- mySearchLabel.setToolTipText("Search Everywhere
Press " +
+ private void initTooltip(JLabel label) {
+ label.setToolTipText("Search Everywhere
Press " +
"Double " +
(SystemInfo.isMac ? MacKeymapUtil.SHIFT : "Shift") +
" to access
- Classes
- Files
- Tool Windows
- Actions
- Settings");
@@ -379,9 +423,6 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
-// editor.setColumns(SystemInfo.isMac ? 5 : 8);
-// field.getTextEditor().setForeground(UIUtil.getLabelDisabledForeground());
-// field.setText(" " + KeymapUtil.getFirstKeyboardShortcutText(SearchEverywhereAction.this));
if (myCalcThread != null) {
myCalcThread.cancel();
myCalcThread = null;
@@ -392,16 +433,12 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
myBalloon.cancel();
myPopup.cancel();
}
-// myContentPanel.remove(field);
-// mySearchLabel.setIcon(AllIcons.Actions.FindPlain);
-// myContentPanel.add(mySearchLabel, BorderLayout.CENTER);
//noinspection SSBasedInspection
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- myContentPanel.revalidate();
- myContentPanel.repaint();
+ ActionToolbarImpl.updateAllToolbarsImmediately();
}
});
}
@@ -499,21 +536,22 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
myCalcThread.start();
}
-
@Override
public void actionPerformed(AnActionEvent e) {
+ actionPerformed(e, null);
+ }
+
+ public void actionPerformed(AnActionEvent e, MouseEvent me) {
if (myBalloon != null && myBalloon.isVisible()) {
return;
}
if (e == null && myFocusOwner != null) {
- e = new AnActionEvent(null, DataManager.getInstance().getDataContext(myFocusComponent), ActionPlaces.UNKNOWN, getTemplatePresentation(), ActionManager.getInstance(), 0);
+ e = new AnActionEvent(me, DataManager.getInstance().getDataContext(myFocusComponent), ActionPlaces.UNKNOWN, getTemplatePresentation(), ActionManager.getInstance(), 0);
}
if (e == null) return;
myContextComponent = PlatformDataKeys.CONTEXT_COMPONENT.getData(e.getDataContext());
- if (myContextComponent == null) {
- myContextComponent = mySearchLabel;
- }
- final Window wnd = SwingUtilities.windowForComponent(myContextComponent);
+ final Window wnd = myContextComponent != null ? SwingUtilities.windowForComponent(myContextComponent)
+ : KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow();
if (wnd == null || wnd.getParent() != null) return;
myActionEvent = e;
myPopupField = new MySearchTextField();
@@ -538,16 +576,6 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
panel.add(title, BorderLayout.WEST);
panel.add(myPopupField, BorderLayout.CENTER);
panel.setBorder(IdeBorderFactory.createEmptyBorder(3, 5, 4, 5));
-// final BalloonPopupBuilderImpl builder = (BalloonPopupBuilderImpl)JBPopupFactory.getInstance().createBalloonBuilder(panel);
-// myBalloon = builder
-// .setCustomPointlessBorder(new EmptyBorder(0,0,0,0))
-// .setShowCallout(false)
-// .setHideOnKeyOutside(false)
-// .setHideOnAction(false)
-// .setAnimationCycle(0)
-// .setBorderColor(new JBColor(Gray._130, Gray._77))
-// .setFillColor(new JBColor(new Color(0x2d60ee), new Color(60, 63, 65)))
-// .createBalloon();
final ComponentPopupBuilder builder = JBPopupFactory.getInstance().createComponentPopupBuilder(panel, myPopupField.getTextEditor());
myBalloon = builder
.setCancelOnClickOutside(true)
@@ -560,8 +588,9 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
final RelativePoint showPoint;
- if (e.getInputEvent() == null) {
- final Component button = mySearchLabel.getParent();
+ if (me != null) {
+ final Component label = me.getComponent();
+ final Component button = label.getParent();
assert button != null;
showPoint = new RelativePoint(button, new Point(button.getWidth() - panel.getPreferredSize().width, button.getHeight()));
} else {
@@ -576,11 +605,6 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
focusManager.requestFocus(myPopupField.getTextEditor(), true);
}
- @Override
- public JComponent createCustomComponent(Presentation presentation) {
- return myContentPanel;
- }
-
private static class MySearchTextField extends SearchTextField implements DataProvider {
public MySearchTextField() {
super(false);
@@ -1295,7 +1319,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
@Override
public boolean check(MouseEvent event) {
final Component c = event.getComponent();
- return myContentPanel != c && getField().getTextEditor() != c;
+ return true;//myContentPanel != c && getField().getTextEditor() != c;
}
})
.createPopup();
@@ -1306,8 +1330,8 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
if (myBalloon!= null) {
myBalloon.cancel();
myBalloon = null;
- initTooltip();
- mySearchLabel.setIcon(AllIcons.Actions.FindPlain);
+// initTooltip(label);
+// mySearchLabel.setIcon(AllIcons.Actions.FindPlain);
}
myFileModel = null;
myFileChooseByName = null;
@@ -1316,7 +1340,15 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
myActions = null;
myFiles = null;
myClasses = null;
+ mySymbolsModel = null;
+ mySymbols = null;
myConfigurables.clear();
+ myFocusComponent = null;
+ myFocusOwner = null;
+ myRenderer.myProject = null;
+ myCalcThread = null;
+ myPopup = null;
+ myActionEvent = null;
}
});
myPopup.show(new RelativePoint(getField().getParent(), new Point(0, getField().getParent().getHeight())));
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
index 5a2f15613327..31d14f5bb13e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
@@ -304,13 +304,12 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar {
final AnAction searchEverywhereAction = ActionManager.getInstance().getAction("SearchEverywhere");
if (searchEverywhereAction != null) {
try {
- final CustomComponentAction searchEveryWhereAction = (CustomComponentAction)searchEverywhereAction.getClass().newInstance();
+ final CustomComponentAction searchEveryWhereAction = (CustomComponentAction)searchEverywhereAction;
final JComponent searchEverywhere = searchEveryWhereAction.createCustomComponent(searchEverywhereAction.getTemplatePresentation());
searchEverywhere.putClientProperty("SEARCH_EVERYWHERE", Boolean.TRUE);
add(searchEverywhere);
}
- catch (InstantiationException ignore) {}
- catch (IllegalAccessException ignore) {}
+ catch (Exception ignore) {}
}
}
}