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

FinderRecursivePanel: one OnePixelSplitter for better UI

Browse Source
This commit is contained in:
Yann Cébron
2016-09-09 11:03:29 +02:00
parent a27210a6f5
commit 900eee8589
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/FinderRecursivePanel.java
+25 -27
View File
@@ -59,7 +59,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
* @param <T> List item type. Must implement {@code equals()/hashCode()} correctly.
* @since 13.0
*/
public abstract class FinderRecursivePanel<T> extends JBSplitter implements DataProvider, Disposable {
public abstract class FinderRecursivePanel<T> extends OnePixelSplitter implements DataProvider, Disposable {
@NotNull
private final Project myProject;
@@ -121,7 +121,7 @@ public abstract class FinderRecursivePanel<T> extends JBSplitter implements Data
}
}
public void init() {
public void initPanel() {
initWithoutUpdatePanel();
updatePanel();
}
@@ -133,9 +133,6 @@ public abstract class FinderRecursivePanel<T> extends JBSplitter implements Data
if (getGroupId() != null) {
setAndLoadSplitterProportionKey(getGroupId() + "[" + getIndex() + "]");
}
setDividerWidth(3);
setShowDividerIcon(false);
setShowDividerControls(true);
}
/**
@@ -515,29 +512,30 @@ public abstract class FinderRecursivePanel<T> extends JBSplitter implements Data
final T oldValue = getSelectedValue();
final int oldIndex = myList.getSelectedIndex();
ApplicationManager.getApplication().executeOnPooledThread(() -> DumbService.getInstance(getProject()).runReadActionInSmartMode(() -> {
try {
final List<T> listItems = getListItems();
ApplicationManager.getApplication()
.executeOnPooledThread(() -> DumbService.getInstance(getProject()).runReadActionInSmartMode(() -> {
try {
final List<T> listItems = getListItems();
SwingUtilities.invokeLater(() -> {
mergeListItems(myListModel, myList, listItems);
SwingUtilities.invokeLater(() -> {
mergeListItems(myListModel, myList, listItems);
if (myList.isEmpty()) {
createRightComponent(true);
}
else if (myList.getSelectedIndex() < 0) {
myList.setSelectedIndex(myListModel.getSize() > oldIndex ? oldIndex : 0);
}
else {
Object newValue = myList.getSelectedValue();
updateRightComponent(oldValue == null || !oldValue.equals(newValue) || myList.isEmpty());
}
});
}
finally {
myList.setPaintBusy(false);
}
}));
if (myList.isEmpty()) {
createRightComponent(true);
}
else if (myList.getSelectedIndex() < 0) {
myList.setSelectedIndex(myListModel.getSize() > oldIndex ? oldIndex : 0);
}
else {
Object newValue = myList.getSelectedValue();
updateRightComponent(oldValue == null || !oldValue.equals(newValue) || myList.isEmpty());
}
});
}
finally {
myList.setPaintBusy(false);
}
}));
}
});
}
@@ -600,7 +598,7 @@ public abstract class FinderRecursivePanel<T> extends JBSplitter implements Data
if (myChild instanceof FinderRecursivePanel) {
final FinderRecursivePanel childPanel = (FinderRecursivePanel)myChild;
if (withUpdatePanel) {
childPanel.init();
childPanel.initPanel();
}
else {
childPanel.initWithoutUpdatePanel();