Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Fauth2023-02-21 10:12:37 +0000
committerDirk Fauth2023-02-21 10:12:37 +0000
commit0635f9e15de83079977a1f8c339801a8dc75b382 (patch)
tree6bccc545ec5ed99e9a3fd66ef1e83ebfd9620878
parent7b5265a19f0b0ae54bc553a29d72575d5ffe0e5b (diff)
downloadorg.eclipse.nebula.widgets.nattable-0635f9e15de83079977a1f8c339801a8dc75b382.tar.gz
org.eclipse.nebula.widgets.nattable-0635f9e15de83079977a1f8c339801a8dc75b382.tar.xz
org.eclipse.nebula.widgets.nattable-0635f9e15de83079977a1f8c339801a8dc75b382.zip
Bug 581559 - Reorder collapsed column groups in frozen state is broken
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com> Change-Id: I1b86023d119adeca369bc61676784a1aadf14512
-rw-r--r--org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractColumnHideShowLayer.java1
-rw-r--r--org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractRowHideShowLayer.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractColumnHideShowLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractColumnHideShowLayer.java
index af339312..00cb8736 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractColumnHideShowLayer.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractColumnHideShowLayer.java
@@ -76,6 +76,7 @@ public abstract class AbstractColumnHideShowLayer extends AbstractLayerTransform
int[] fromPositions = reorderEvent.getBeforeFromColumnIndexes().stream()
.mapToInt(Integer::intValue)
.map(this::getColumnPositionByIndex)
+ .filter(pos -> pos >= 0)
.toArray();
Collection<Range> fromRanges = PositionUtil.getRanges(fromPositions);
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractRowHideShowLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractRowHideShowLayer.java
index 2a0ba8cb..9359f8e9 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractRowHideShowLayer.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractRowHideShowLayer.java
@@ -76,6 +76,7 @@ public abstract class AbstractRowHideShowLayer extends AbstractLayerTransform im
int[] fromPositions = reorderEvent.getBeforeFromRowIndexes().stream()
.mapToInt(Integer::intValue)
.map(this::getRowPositionByIndex)
+ .filter(pos -> pos >= 0)
.toArray();
Collection<Range> fromRanges = PositionUtil.getRanges(fromPositions);

Back to the top