feat: add CollectableHelper#updateUnderlayModel

teletha · Feb 16, 2024 · c3c6d37 · c3c6d37
1 parent 200056b
commit c3c6d37
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/main/java/viewtify/preference/Preferences.java b/src/main/java/viewtify/preference/Preferences.java
@@ -19,6 +19,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import javafx.collections.ObservableList;
 import kiss.Extensible;
 import kiss.I;
 import kiss.Model;
@@ -240,7 +241,7 @@ public static <P extends Preferences> P of(Class<P> type, String name) {
      * @param type
      * @return
      */
-    public static <P extends Preferences> List<P> all(Class<P> type) {
+    public static <P extends Preferences> ObservableList<P> all(Class<P> type) {
         return CACHE_LIST.computeIfAbsent(type, PreferencesList::new);
     }
 

diff --git a/src/main/java/viewtify/ui/AbstractPane.java b/src/main/java/viewtify/ui/AbstractPane.java
@@ -44,6 +44,7 @@ public abstract class AbstractPane<E, P extends Pane, Self extends AbstractPane>
     /** The model modifier. */
     private final ListChangeListener<E> modelModifier = c -> {
         while (c.next()) {
+            System.out.println(c);
             if (c.wasPermutated()) {
                 Map<Integer, Integer> mapping = new HashMap();
                 for (int i = c.getFrom(); i < c.getTo(); i++) {
@@ -136,7 +137,12 @@ private void addUI(Iterable<? extends E> models) {
                 views.put(added, view);
                 animator.observe(node);
 
-                ui.getChildren().add(this.models.get().indexOf(added), node);
+                int index = this.models.get().indexOf(added);
+                if (index == -1) {
+                    ui.getChildren().add(node);
+                } else {
+                    ui.getChildren().add(index, node);
+                }
 
                 ShowAnime.FadeIn(1).run(ui, node);
             }

diff --git a/src/main/java/viewtify/ui/helper/CollectableHelper.java b/src/main/java/viewtify/ui/helper/CollectableHelper.java
@@ -37,7 +37,6 @@
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.collections.transformation.SortedList;
-
 import kiss.Disposable;
 import kiss.I;
 import kiss.Signal;
@@ -937,6 +936,18 @@ default Self reapply() {
         return (Self) this;
     }
 
+    /**
+     * Update the original {@link ObservableList}, which should not normally be touched.
+     * 
+     * @param newList
+     */
+    default Self updateUnderlayModel(ObservableList<E> newList) {
+        if (newList != null) {
+            refer().items.setValue(newList);
+        }
+        return (Self) this;
+    }
+
     /**
      * Retrieve the special reference holder.
      *