Merge lp:~vikoadi/slingshot/keyboard-navigation into lp:~elementary-pantheon/slingshot/trunk

Proposed by Viko Adi Rahmawan on 2015-03-24
Status: Merged
Approved by: Cody Garver on 2015-03-24
Approved revision: 517
Merged at revision: 516
Proposed branch: lp:~vikoadi/slingshot/keyboard-navigation
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 28 lines (+2/-2)
1 file modified
src/Widgets/SearchView.vala (+2/-2)
To merge this branch: bzr merge lp:~vikoadi/slingshot/keyboard-navigation
Reviewer Review Type Date Requested Status
elementary Pantheon team 2015-03-24 Pending
Review via email: mp+253971@code.launchpad.net

Commit message

* clear state flags before turning PRELIGHT on
* dont clear() on every category changes

Description of the change

* clear state flags before turning PRELIGHT on
* dont clear() on every category changes

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/SearchView.vala'
2--- src/Widgets/SearchView.vala 2015-02-01 15:02:37 +0000
3+++ src/Widgets/SearchView.vala 2015-03-24 15:28:40 +0000
4@@ -132,6 +132,7 @@
5 }
6
7 n_results = 0;
8+ clear ();
9
10 // if we're showing more than about 10 results and we have more than
11 // categories, we limit the results per category to the most relevant
12@@ -181,7 +182,6 @@
13
14 var list = categories.get (type);
15 var old_selected = selected;
16- clear ();
17 for (var i = 0; i < limit && i < list.size; i++) {
18 var match = list.get (i);
19
20@@ -291,7 +291,7 @@
21 else
22 selected_app = box.get_children ().nth_data (index) as SearchItem;
23
24- selected_app.set_state_flags (Gtk.StateFlags.PRELIGHT, false);
25+ selected_app.set_state_flags (Gtk.StateFlags.PRELIGHT, true);
26
27 Gtk.Allocation alloc;
28 selected_app.get_allocation (out alloc);

Subscribers

People subscribed via source and target branches