diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index cebf28d0..ae48545d 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -996,7 +996,7 @@ public class BookmarkPanel extends PanelWidget { @Override public boolean onMouseWheel(int shift, int mousex, int mousey) { - if (!inEditingState() && new Rectangle4i( + if ((!inEditingState() || this.sortableGroup != null) && new Rectangle4i( namespacePrev.x, namespacePrev.y, namespaceNext.x + namespaceNext.w - namespacePrev.x, diff --git a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java index 513b34b6..f6d3a052 100644 --- a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java +++ b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java @@ -771,6 +771,25 @@ public class BookmarkGrid extends ItemsGrid itemsToMove = sortableGroup.getBookmarkItems(); + + sortableGroup.grid.removeGroup(sortableGroup.groupId); + + final int groupId = this.addGroup(sourceGroup); + for (BookmarkItem item : itemsToMove) { + item.groupId = groupId; + this.bookmarkItems.add(item); + } + + sortableGroup.grid = this; + sortableGroup.groupId = groupId; + this.onItemsChanged(); + this.getMask();// force generate grid + } + if (sortableGroup.groupId == overGroupId) { return; }