feat: Scrollable launcher results

pop-os · Jan 5, 2021 · 66575fa · 66575fa
1 parent 90585cb
commit 66575fa
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/src/dialog_search.ts b/src/dialog_search.ts
@@ -21,6 +21,7 @@ export class Search {
     private list: St.Widget;
     private text: Clutter.Text;
     private widgets: Array<St.Widget>;
+    private scroller: St.Widget;
 
     private apply_cb: (index: number) => boolean;
     private cancel_cb: () => void;
@@ -130,8 +131,13 @@ export class Search {
             vertical: true,
         });
 
+        const scroller = new St.ScrollView()
+        scroller.add_actor(this.list)
+
         this.dialog.contentLayout.add(this.entry);
-        this.dialog.contentLayout.add(this.list);
+        this.dialog.contentLayout.add(scroller);
+
+        this.scroller = scroller
 
         // Ensure that the width is at least 640 pixels wide.
         this.dialog.contentLayout.width = Math.max(Lib.current_monitor().width / 4, 640);
@@ -167,7 +173,7 @@ export class Search {
     }
 
     list_max() {
-        return 9;
+        return 18;
     }
 
     reset() {
@@ -182,9 +188,10 @@ export class Search {
     }
 
     select() {
-        this.widgets[this.active_id].add_style_pseudo_class(
-            "select"
-        );
+        const widget = this.widgets[this.active_id]
+        widget.add_style_pseudo_class("select")
+
+        imports.misc.util.ensureActorVisibleInScrollView(this.scroller, widget)
     }
 
     select_id(id: number) {
@@ -232,6 +239,13 @@ export class Search {
             this.select();
             this.select_cb(0);
         }
+
+        const vscroll = (this.scroller as any).get_vscroll_bar()
+        if ((this.scroller as any).vscrollbar_visible) {
+            vscroll.show()
+        } else {
+            vscroll.hide()
+        }
     }
 
     set_text(text: string) {

diff --git a/src/mod.d.ts b/src/mod.d.ts
@@ -117,6 +117,7 @@ declare namespace Clutter {
         get_parent(): Clutter.Actor | null;
         get_stage(): Clutter.Actor | null;
         get_transition(param: string): any | null;
+        grab_key_focus(): void;
         is_visible(): boolean;
         queue_redraw(): void;
         remove_all_children(): void;
@@ -290,6 +291,5 @@ declare namespace St {
         clutter_text: any;
 
         get_clutter_text(): Clutter.Text;
-        grab_key_focus(): void;
     }
 }
diff --git a/src/plugins/files/main.js b/src/plugins/files/main.js
@@ -98,7 +98,7 @@ class App {
                         directory
                     })
 
-                    if (this.selections.length === 10) break
+                    if (this.selections.length === 20) break
                 }
             }
 

diff --git a/src/plugins/recent/main.js b/src/plugins/recent/main.js
@@ -74,7 +74,7 @@ class App {
             this.results = items
                 .filter(item => item.display_name.toLowerCase().includes(normalized))
                 .sort((a, b) => a.display_name.localeCompare(b.display_name))
-                .slice(0, 9)
+                .slice(0, 20)
 
             let id = 0