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 In Path: add 'Search in progress' animated icon in top left corner

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2017-06-09 23:42:23 +03:00
parent 512033e40c
commit 9ad89facc6
1 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java
+50 -10
View File
@@ -39,6 +39,7 @@ import com.intellij.openapi.progress.util.ProgressIndicatorUtils;
import com.intellij.openapi.progress.util.ReadTask;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.LoadingDecorator;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.ui.OnePixelDivider;
import com.intellij.openapi.ui.ValidationInfo;
@@ -72,10 +73,7 @@ import com.intellij.util.Alarm;
import com.intellij.util.ArrayUtil;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.JBFont;
import com.intellij.util.ui.JBInsets;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.*;
import net.miginfocom.swing.MigLayout;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -139,6 +137,8 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
private JBTable myResultsPreviewTable;
private UsagePreviewPanel myUsagePreviewPanel;
private JBPopup myBalloon;
private LoadingDecorator myLoadingDecorator;
private int myLoadingHash;
FindPopupPanel(@NotNull FindUIHelper helper) {
myHelper = helper;
@@ -218,6 +218,8 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
WindowMoveListener windowListener = new WindowMoveListener(this);
myTitleLabel.addMouseListener(windowListener);
myTitleLabel.addMouseMotionListener(windowListener);
myLoadingDecorator.getComponent().addMouseListener(windowListener);
myLoadingDecorator.getComponent().addMouseMotionListener(windowListener);
Dimension panelSize = getPreferredSize();
Dimension prev = DimensionService.getInstance().getSize(SERVICE_KEY);
if (!myCbPreserveCase.isVisible()) {
@@ -269,7 +271,9 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
private void initComponents() {
myTitleLabel = new JBLabel(FindBundle.message("find.in.path.dialog.title"), UIUtil.ComponentStyle.REGULAR);
myTitleLabel.setFont(myTitleLabel.getFont().deriveFont(Font.BOLD));
myTitleLabel.setBorder(JBUI.Borders.empty(0, 4, 0, 16));
myTitleLabel.setBorder(JBUI.Borders.empty(0, 0, 0, 16));
myLoadingDecorator = new LoadingDecorator(new JLabel(" ", EmptyIcon.ICON_16, SwingConstants.LEADING), getDisposable(), 250, true, new AsyncProcessIcon("FindInPathLoading"));
myLoadingDecorator.setLoadingText("");
myCbCaseSensitive = createCheckBox("find.popup.case.sensitive");
ItemListener liveResultsPreviewUpdateListener = new ItemListener() {
@Override
@@ -581,7 +585,10 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
int cbGapLeft = myCbCaseSensitive.getInsets().left;
int cbGapRight = myCbCaseSensitive.getInsets().right;
String cbGap = cbGapLeft + cbGapRight < 16 ? "gapright " + (16 - cbGapLeft - cbGapRight) : "";
add(myTitleLabel, "sx 2, growx, pushx, growy");
JPanel titlePanel = new JPanel(new BorderLayout());
titlePanel.add(myLoadingDecorator.getComponent(), BorderLayout.WEST);
titlePanel.add(myTitleLabel, BorderLayout.CENTER);
add(titlePanel, "sx 2, growx, pushx, growy");
add(myCbCaseSensitive, cbGap);
add(myCbPreserveCase, cbGap);
add(myCbWholeWordsOnly, cbGap);
@@ -770,8 +777,15 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
ValidationInfo result = getValidationInfo(myHelper.getModel());
final ProgressIndicatorBase progressIndicatorWhenSearchStarted = new ProgressIndicatorBase();
final ProgressIndicatorBase progressIndicatorWhenSearchStarted = new ProgressIndicatorBase() {
@Override
public void stop() {
super.stop();
onStop(System.identityHashCode(this));
}
};
myResultsPreviewSearchProgress = progressIndicatorWhenSearchStarted;
final int hash = System.identityHashCode(myResultsPreviewSearchProgress);
final DefaultTableModel model = new DefaultTableModel() {
@Override
@@ -802,6 +816,7 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
if (result != null) {
myResultsPreviewTable.getEmptyText().setText(UIBundle.message("message.nothingToShow") + " ("+result.message+")");
onStop(hash);
return;
}
@@ -810,6 +825,7 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
myResultsPreviewTable.getColumnModel().getColumn(0).setCellRenderer(
new FindDialog.UsageTableCellRenderer(myCbFileFilter.isSelected(), false, scope));
myResultsPreviewTable.getEmptyText().setText("Searching...");
onStart(hash);
final AtomicInteger resultsCount = new AtomicInteger();
final AtomicInteger resultsFilesCount = new AtomicInteger();
@@ -828,6 +844,7 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
FindInProjectUtil.findUsages(myHelper.getModel().clone(), myProject, info -> {
if(isCancelled()) {
onStop(hash);
return false;
}
final Usage usage = UsageInfo2UsageAdapter.CONVERTER.fun(info);
@@ -844,7 +861,7 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
UsageInfo2UsageAdapter recentAdapter =
recent != null && recent instanceof UsageInfo2UsageAdapter ? (UsageInfo2UsageAdapter)recent : null;
UsageInfo2UsageAdapter currentAdapter = usage instanceof UsageInfo2UsageAdapter ? (UsageInfo2UsageAdapter)usage : null;
if (currentAdapter != null && recentAdapter != null && recentAdapter.getFile().equals(usageFile) && recentAdapter.getLine() == currentAdapter.getLine()) {
if (currentAdapter != null && recentAdapter != null) {
merged = recentAdapter.merge(currentAdapter);
} else {
merged = false;
@@ -853,11 +870,14 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
ApplicationManager.getApplication().invokeLater(() -> {
if(isCancelled()) {
if (isCancelled()) {
onStop(hash);
return;
}
if (!merged) {
model.addRow(new Object[]{usage});
} else {
model.fireTableRowsUpdated(model.getRowCount() - 1, model.getRowCount() - 1);
}
myCodePreviewComponent.setVisible(true);
if (model.getRowCount() == 1 && myResultsPreviewTable.getModel() == model) {
@@ -885,13 +905,18 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
mySearchTextArea.setInfoText(stringBuilder.toString());
}, state);
return resultsCount.incrementAndGet() < ShowUsagesAction.USAGES_PAGE_SIZE;
boolean continueSearch = resultsCount.incrementAndGet() < ShowUsagesAction.USAGES_PAGE_SIZE;
if (!continueSearch) {
onStop(hash);
}
return continueSearch;
}, processPresentation, filesToScanInitially);
return new Continuation(() -> {
if (!isCancelled()) {
if (resultsCount.get() == 0) myResultsPreviewTable.getEmptyText().setText(UIBundle.message("message.nothingToShow"));
}
onStop(hash);
}, state);
}
@@ -908,6 +933,21 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
});
}
private void onStart(int hash) {
myLoadingHash = hash;
myLoadingDecorator.startLoading(false);
}
private void onStop(int hash) {
if (hash != myLoadingHash) {
return;
}
UIUtil.invokeLaterIfNeeded(() -> {
myLoadingDecorator.stopLoading();
});
}
@Nullable
public String getFileTypeMask() {
String mask = null;