Slingshot

Merge lp:~mefrio-g/slingshot/fix-915052 into lp:~elementary-pantheon/slingshot/trunk

  1. fix-915052
  2. Merge into trunk
Proposed by Mario Guerriero
Status: Merged
Approved by: Victor Martinez
Approved revision: 183
Merged at revision: 183
Proposed branch: lp:~mefrio-g/slingshot/fix-915052
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 93 lines (+10/-10)
1 file modified
src/SlingshotView.vala (+10/-10)
To merge this branch: bzr merge lp:~mefrio-g/slingshot/fix-915052
Reviewer Review Type Date Requested Status
Victor Martinez (community) Approve
Review via email: mp+100443@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Victor Martinez (victored) wrote :

This is the most reasonable fix. Thanks for your work Mario!

review: Approve
Revision history for this message
Victor Martinez (victored) wrote :

I wonder what happened. I could have sworn I merged this branch :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala 2012-04-25 09:06:16 +0000
+++ src/SlingshotView.vala 2012-05-10 14:16:17 +0000
@@ -309,7 +309,7 @@
309 case "KP_1":309 case "KP_1":
310 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)310 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
311 page_switcher.set_active (0);311 page_switcher.set_active (0);
312 else if (modality == Modality.CATEGORY_VIEW)312 else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
313 category_view.switcher.set_active (0);313 category_view.switcher.set_active (0);
314 else314 else
315 return base.key_press_event (event);315 return base.key_press_event (event);
@@ -319,7 +319,7 @@
319 case "KP_2":319 case "KP_2":
320 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)320 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
321 page_switcher.set_active (1);321 page_switcher.set_active (1);
322 else if (modality == Modality.CATEGORY_VIEW)322 else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
323 category_view.switcher.set_active (1);323 category_view.switcher.set_active (1);
324 else324 else
325 return base.key_press_event (event);325 return base.key_press_event (event);
@@ -329,7 +329,7 @@
329 case "KP_3":329 case "KP_3":
330 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)330 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
331 page_switcher.set_active (2);331 page_switcher.set_active (2);
332 else if (modality == Modality.CATEGORY_VIEW)332 else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
333 category_view.switcher.set_active (2);333 category_view.switcher.set_active (2);
334 else334 else
335 return base.key_press_event (event);335 return base.key_press_event (event);
@@ -339,7 +339,7 @@
339 case "KP_4":339 case "KP_4":
340 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)340 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
341 page_switcher.set_active (3);341 page_switcher.set_active (3);
342 else if (modality == Modality.CATEGORY_VIEW)342 else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
343 category_view.switcher.set_active (3);343 category_view.switcher.set_active (3);
344 else344 else
345 return base.key_press_event (event);345 return base.key_press_event (event);
@@ -349,7 +349,7 @@
349 case "KP_5":349 case "KP_5":
350 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)350 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
351 page_switcher.set_active (4);351 page_switcher.set_active (4);
352 else if (modality == Modality.CATEGORY_VIEW)352 else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
353 category_view.switcher.set_active (4);353 category_view.switcher.set_active (4);
354 else354 else
355 return base.key_press_event (event);355 return base.key_press_event (event);
@@ -359,7 +359,7 @@
359 case "KP_6":359 case "KP_6":
360 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)360 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
361 page_switcher.set_active (5);361 page_switcher.set_active (5);
362 else if (modality == Modality.CATEGORY_VIEW)362 else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
363 category_view.switcher.set_active (5);363 category_view.switcher.set_active (5);
364 else364 else
365 return base.key_press_event (event);365 return base.key_press_event (event);
@@ -369,7 +369,7 @@
369 case "KP_7":369 case "KP_7":
370 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)370 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
371 page_switcher.set_active (6);371 page_switcher.set_active (6);
372 else if (modality == Modality.CATEGORY_VIEW)372 else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
373 category_view.switcher.set_active (6);373 category_view.switcher.set_active (6);
374 else374 else
375 return base.key_press_event (event);375 return base.key_press_event (event);
@@ -379,7 +379,7 @@
379 case "KP_8":379 case "KP_8":
380 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)380 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
381 page_switcher.set_active (7);381 page_switcher.set_active (7);
382 else if (modality == Modality.CATEGORY_VIEW)382 else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
383 category_view.switcher.set_active (7);383 category_view.switcher.set_active (7);
384 else384 else
385 return base.key_press_event (event);385 return base.key_press_event (event);
@@ -389,7 +389,7 @@
389 case "KP_9":389 case "KP_9":
390 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)390 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
391 page_switcher.set_active (8);391 page_switcher.set_active (8);
392 else if (modality == Modality.CATEGORY_VIEW)392 else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
393 category_view.switcher.set_active (8);393 category_view.switcher.set_active (8);
394 else394 else
395 return base.key_press_event (event);395 return base.key_press_event (event);
@@ -399,7 +399,7 @@
399 case "KP_0":399 case "KP_0":
400 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)400 if (modality == Modality.NORMAL_VIEW && !searchbar.has_focus)
401 page_switcher.set_active (9);401 page_switcher.set_active (9);
402 else if (modality == Modality.CATEGORY_VIEW)402 else if (modality == Modality.CATEGORY_VIEW && !searchbar.has_focus)
403 category_view.switcher.set_active (9);403 category_view.switcher.set_active (9);
404 else404 else
405 return base.key_press_event (event);405 return base.key_press_event (event);

Subscribers

People subscribed via source and target branches