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

Proposed by Viko Adi Rahmawan
Status: Merged
Approved by: Cody Garver
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 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
=== modified file 'src/Widgets/SearchView.vala'
--- src/Widgets/SearchView.vala 2015-02-01 15:02:37 +0000
+++ src/Widgets/SearchView.vala 2015-03-24 15:28:40 +0000
@@ -132,6 +132,7 @@
132 }132 }
133133
134 n_results = 0;134 n_results = 0;
135 clear ();
135136
136 // if we're showing more than about 10 results and we have more than137 // if we're showing more than about 10 results and we have more than
137 // categories, we limit the results per category to the most relevant138 // categories, we limit the results per category to the most relevant
@@ -181,7 +182,6 @@
181182
182 var list = categories.get (type);183 var list = categories.get (type);
183 var old_selected = selected;184 var old_selected = selected;
184 clear ();
185 for (var i = 0; i < limit && i < list.size; i++) {185 for (var i = 0; i < limit && i < list.size; i++) {
186 var match = list.get (i);186 var match = list.get (i);
187187
@@ -291,7 +291,7 @@
291 else291 else
292 selected_app = box.get_children ().nth_data (index) as SearchItem;292 selected_app = box.get_children ().nth_data (index) as SearchItem;
293293
294 selected_app.set_state_flags (Gtk.StateFlags.PRELIGHT, false);294 selected_app.set_state_flags (Gtk.StateFlags.PRELIGHT, true);
295295
296 Gtk.Allocation alloc;296 Gtk.Allocation alloc;
297 selected_app.get_allocation (out alloc);297 selected_app.get_allocation (out alloc);

Subscribers

People subscribed via source and target branches