[gnome-characters/wip/exalm/reflow: 2/2] characterView: Fix reflowing in size_allocate()

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit 60983a358b98860383f130d8b52e5f6d162f6642
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Mar 7 13:35:07 2022 +0400

    characterView: Fix reflowing in size_allocate()
    
    We need to reflow first, then use the new grid to calculate the size, not
    the other way around. We also shouldn't queue resize from size_allocate().
    
    See https://gitlab.gnome.org/GNOME/gnome-characters/-/issues/94

 src/charactersView.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/src/charactersView.js b/src/charactersView.js
index 266c040..a883396 100644
--- a/src/charactersView.js
+++ b/src/charactersView.js
@@ -348,6 +348,12 @@ var CharactersView = GObject.registerClass({
         let cellSize = getCellSize(this._fontDescription);
         let cellsPerRow = Math.floor(width / cellSize);
 
+        if (cellsPerRow !== this._cellsPerRow) {
+            // Reflow if the number of cells per row has changed.
+            this._cellsPerRow = cellsPerRow;
+            this._reflow();
+        }
+
         let maxHeight = Math.floor((this._rows.length + BASELINE_OFFSET) * cellSize);
         let maxWidth = cellsPerRow * cellSize;
 
@@ -355,12 +361,6 @@ var CharactersView = GObject.registerClass({
         let vadj = this.get_vadjustment();
         vadj.configure(vadj.get_value(), 0.0, maxHeight, 0.1 * height, 0.9 * height, Math.min(height, 
maxHeight));
         hadj.configure(hadj.get_value(), 0.0, maxWidth, 0.1 * width, 0.9 * width, Math.min(width, maxWidth));
-
-        if (cellsPerRow !== this._cellsPerRow) {
-            // Reflow if the number of cells per row has changed.
-            this._cellsPerRow = cellsPerRow;
-            this.setCharacters(this._characters);
-        }
     }
 
     _createCharacterListRow(characters) {
@@ -376,27 +376,29 @@ var CharactersView = GObject.registerClass({
         this._fontDescription = fontDescription;
     }
 
-    setCharacters(characters) {
+    _reflow() {
         this._rows = [];
-        this._characters = characters;
 
         let start = 0, stop = 1;
-        for (; stop <= characters.length; stop++) {
+        for (; stop <= this._characters.length; stop++) {
             if (stop % this._cellsPerRow === 0) {
-                let rowCharacters = characters.slice(start, stop);
+                let rowCharacters = this._characters.slice(start, stop);
                 let row = this._createCharacterListRow(rowCharacters);
                 this._rows.push(row);
                 start = stop;
             }
         }
         if (start !== stop - 1) {
-            let rowCharacters = characters.slice(start, stop);
+            let rowCharacters = this._characters.slice(start, stop);
             let row = this._createCharacterListRow(rowCharacters);
             this._rows.push(row);
         }
+    }
 
+    setCharacters(characters) {
+        this._characters = characters;
+        this._reflow();
         this.queue_resize();
-        this.queue_draw();
     }
 
     _addSearchResult(result) {