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

DBE-273 Sorting results grid with row selected causes horizontal scroll position to change

Browse Source
This commit is contained in:
dmirtiy.tseyler
2016-04-14 18:22:42 +03:00
parent 1774de3f12
commit e4ea3dfbc1
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/ui/JBAutoscroller.java
+34 -7
View File
@@ -45,19 +45,23 @@ public class JBAutoscroller implements ActionListener {
private JBAutoscroller() {
}
public static void installOn(@NotNull JComponent component) {
installOn(component, null);
public static void installOn(@NotNull JComponent component, @Nullable AutoscrollLocker locker) {
installOn(component, null, locker);
}
public static void installOn(@NotNull JComponent component, @Nullable ScrollDeltaProvider handler) {
getInstance().doInstallOn(component, handler);
installOn(component, handler, null);
}
public static void installOn(@NotNull JComponent component, @Nullable ScrollDeltaProvider handler, @Nullable AutoscrollLocker locker) {
getInstance().doInstallOn(component, handler, locker);
}
private static JBAutoscroller getInstance() {
return INSTANCE;
}
private void doInstallOn(@NotNull JComponent component, @Nullable ScrollDeltaProvider handler) {
private void doInstallOn(@NotNull JComponent component, @Nullable ScrollDeltaProvider handler, @Nullable AutoscrollLocker locker) {
component.setAutoscrolls(false); // disable swing autoscroll
if (handler != null) {
@@ -67,7 +71,7 @@ public class JBAutoscroller implements ActionListener {
if (component instanceof JTable) {
JTable t = (JTable)component;
new MoveTableCellEditorOnAutoscrollFix(t);
new ScrollOnTableSelectionChangeFix(t);
new ScrollOnTableSelectionChangeFix(t, locker);
}
component.addMouseListener(new MouseAdapter() {
@@ -190,6 +194,23 @@ public class JBAutoscroller implements ActionListener {
}
}
public static class AutoscrollLocker {
private boolean locked;
public boolean locked() {
return locked;
}
public void runWithLock(Runnable runnable) {
try {
locked = true;
runnable.run();
} finally {
locked = false;
}
}
}
private static class SyntheticDragEvent extends MouseEvent {
public SyntheticDragEvent(Component source, int id, long when, int modifiers,
int x, int y, int xAbs, int yAbs,
@@ -263,9 +284,11 @@ public class JBAutoscroller implements ActionListener {
// Particularly, scrollRectToVisible in javax.swing.JTable#changeSelection won't be called.
private static class ScrollOnTableSelectionChangeFix implements ListSelectionListener, PropertyChangeListener {
private final JTable myTable;
private final AutoscrollLocker myLocker;
public ScrollOnTableSelectionChangeFix(JTable table) {
public ScrollOnTableSelectionChangeFix(JTable table, AutoscrollLocker locker) {
myTable = table;
myLocker = locker;
myTable.addPropertyChangeListener("selectionModel", this);
myTable.addPropertyChangeListener("columnModel", this);
@@ -276,7 +299,7 @@ public class JBAutoscroller implements ActionListener {
@Override
public void valueChanged(ListSelectionEvent e) {
if (e.getValueIsAdjusting() || getInstance().isRunningOn(myTable)) return;
if (e.getValueIsAdjusting() || getInstance().isRunningOn(myTable) || locked()) return;
int row = getLeadSelectionIndexIfSelectionIsNotEmpty(getRowSelectionModel());
int col = getLeadSelectionIndexIfSelectionIsNotEmpty(getColumnSelectionModel());
@@ -286,6 +309,10 @@ public class JBAutoscroller implements ActionListener {
}
}
private boolean locked() {
return myLocker != null && myLocker.locked();
}
@Override
public void propertyChange(PropertyChangeEvent evt) {
ListSelectionModel oldSelectionModel = null;