Evict unused objects from skin only (#281)

gluonhq · Aug 1, 2023 · 8d58f69 · 8d58f69
1 parent 71b2f64
commit 8d58f69
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/rta/src/main/java/com/gluonhq/richtextarea/ParagraphTile.java b/rta/src/main/java/com/gluonhq/richtextarea/ParagraphTile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Gluon
+ * Copyright (c) 2022, 2023, Gluon
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -288,8 +288,8 @@ void mouseDraggedListener(MouseEvent e) {
         });
     }
 
-    void evictUnusedObjects() {
-        layers.forEach(Layer::evictUnusedObjects);
+    void evictUnusedObjects(Set<Font> usedFonts, Set<Image> usedImages) {
+        layers.forEach(layer -> layer.evictUnusedObjects(usedFonts, usedImages));
     }
 
     void updateLayout() {
@@ -461,26 +461,20 @@ void mouseDraggedListener(MouseEvent e) {
             e.consume();
         }
 
-        void evictUnusedObjects() {
-            Set<Font> usedFonts = textFlow.getChildren()
+        void evictUnusedObjects(Set<Font> usedFonts, Set<Image> usedImages) {
+            usedFonts.addAll(textFlow.getChildren()
                     .stream()
                     .filter(Text.class::isInstance)
                     .map(t -> ((Text) t).getFont())
                     .filter(Objects::nonNull)
-                    .collect(Collectors.toSet());
-            List<Font> cachedFonts = new ArrayList<>(richTextAreaSkin.getFontCache().values());
-            cachedFonts.removeAll(usedFonts);
-            richTextAreaSkin.getFontCache().values().removeAll(cachedFonts);
+                    .collect(Collectors.toSet()));
 
-            Set<Image> usedImages = textFlow.getChildren()
+            usedImages.addAll(textFlow.getChildren()
                     .stream()
                     .filter(ImageView.class::isInstance)
                     .map(t -> ((ImageView) t).getImage())
                     .filter(Objects::nonNull)
-                    .collect(Collectors.toSet());
-            List<Image> cachedImages = new ArrayList<>(richTextAreaSkin.getImageCache().values());
-            cachedImages.removeAll(usedImages);
-            richTextAreaSkin.getImageCache().values().removeAll(cachedImages);
+                    .collect(Collectors.toSet()));
         }
 
         double getCaretY() {

diff --git a/rta/src/main/java/com/gluonhq/richtextarea/RichListCell.java b/rta/src/main/java/com/gluonhq/richtextarea/RichListCell.java
@@ -58,6 +58,7 @@
 import java.util.ArrayList;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -315,8 +316,8 @@ private ImageView buildImage(ImageDecoration imageDecoration) {
         return imageView;
     }
 
-    void evictUnusedObjects() {
-        getParagraphTile().ifPresent(ParagraphTile::evictUnusedObjects);
+    void evictUnusedObjects(Set<Font> usedFonts, Set<Image> usedImages) {
+        getParagraphTile().ifPresent(tile -> tile.evictUnusedObjects(usedFonts, usedImages));
     }
 
     public void forwardDragEvent(MouseEvent e) {

diff --git a/rta/src/main/java/com/gluonhq/richtextarea/RichTextAreaSkin.java b/rta/src/main/java/com/gluonhq/richtextarea/RichTextAreaSkin.java
@@ -99,16 +99,20 @@
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
 
+import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.ResourceBundle;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static com.gluonhq.richtextarea.viewmodel.RichTextAreaViewModel.Direction;
 import static java.util.Map.entry;
@@ -447,10 +451,24 @@ protected VirtualFlow<ListCell<Paragraph>> createVirtualFlow() {
         }
 
         void evictUnusedObjects() {
+            Set<Font> usedFonts = new HashSet<>();
+            Set<Image> usedImages = new HashSet<>();
             getSheet().getChildren().stream()
                     .filter(RichListCell.class::isInstance)
                     .map(RichListCell.class::cast)
-                    .forEach(RichListCell::evictUnusedObjects);
+                    .forEach(cell -> cell.evictUnusedObjects(usedFonts, usedImages));
+
+            List<Font> cachedFonts = new ArrayList<>(getFontCache().values());
+            cachedFonts.removeAll(usedFonts);
+            if (!cachedFonts.isEmpty()) {
+                getFontCache().values().removeAll(cachedFonts);
+            }
+
+            List<Image> cachedImages = new ArrayList<>(getImageCache().values());
+            cachedImages.removeAll(usedImages);
+            if (!cachedImages.isEmpty()) {
+                getImageCache().values().removeAll(cachedImages);
+            }
         }
 
         int getNextRowPosition(double x, boolean down) {