[gnome-maps/wip/mlundblad/search-as-you-type: 12/12] WIP: placeEntry: Auto-complete searches



commit 2b27a42d1db6ba3dcbb7b9b5722b4b82c74f8158
Author: Marcus Lundblad <ml update uu se>
Date:   Sun May 5 21:38:14 2019 +0200

    WIP: placeEntry: Auto-complete searches

 src/placeEntry.js | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/src/placeEntry.js b/src/placeEntry.js
index 8fc86f5..b06c949 100644
--- a/src/placeEntry.js
+++ b/src/placeEntry.js
@@ -34,6 +34,9 @@ const PlaceStore = imports.placeStore;
 const PlacePopover = imports.placePopover;
 const Utils = imports.utils;
 
+// minimum number of characters to start completion, TODO: how to handle ideographs?
+const MIN_CHARS_COMPLETION = 3;
+
 var PlaceEntry = GObject.registerClass({
     Properties: {
         'place': GObject.ParamSpec.object('place',
@@ -54,11 +57,13 @@ var PlaceEntry = GObject.registerClass({
 
         if (p) {
             if (p.name) {
-                this.text = p.name;
+                this._placeText = p.name;
             } else
-                this.text = p.location.latitude + ', ' + p.location.longitude;
+                this._placeText = p.location.latitude + ', ' + p.location.longitude;
         } else
-            this.text = '';
+            this._placeText = '';
+
+        this.text = this._placeText;
 
         this._place = p;
         this.notify('place');
@@ -103,18 +108,32 @@ var PlaceEntry = GObject.registerClass({
             if (this._cancellable)
                 this._cancellable.cancel();
 
-            this._refreshFilter();
+            //this._refreshFilter();
 
             if (this.text.length === 0) {
                 this._popover.hide();
                 this.place = null;
+                this._previousSearch = null;
+                return;
+            } else if (this.text.length >= MIN_CHARS_COMPLETION &&
+                       this.text !== this._placeText) {
+                // if no previous search has been performed, show spinner
+                if (!this._previousSearch ||
+                    this._previousSearch.length < MIN_CHARS_COMPLETION ||
+                    this._placeText) {
+                    this._popover.showSpinner();
+                }
+                this._placeText = '';
+                this._doSearch();
                 return;
             }
 
+            /*
             if (this._filter.iter_n_children(null) > 0)
                 this._popover.showCompletion();
             else
                 this._popover.hide();
+            */
         });
 
         if (parseOnFocusOut) {
@@ -207,7 +226,10 @@ var PlaceEntry = GObject.registerClass({
         let bbox = this._mapView.view.get_bounding_box();
 
         this._popover.showSpinner();
+        this._doSearch();
+    }
 
+    _doSearch() {
         this._cancellable = new Gio.Cancellable();
         Application.photonGeocode.search(this.text,
                                          this._mapView.view.latitude,
@@ -222,6 +244,7 @@ var PlaceEntry = GObject.registerClass({
             }
             this._popover.updateResult(places, this.text);
             this._popover.showResult();
+            this._previousSearch = this.text;
         });
     }
 });


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]