unity-2d

Merge lp:~osomon/unity-2d/fix-shortcut-text-modulo-10 into lp:unity-2d/3.0

  1. fix-shortcut-text-modulo-10
  2. Merge into natty
Proposed by Olivier Tilloy
Status: Merged
Approved by: Ugo Riboni
Approved revision: 553
Merged at revision: 554
Proposed branch: lp:~osomon/unity-2d/fix-shortcut-text-modulo-10
Merge into: lp:unity-2d/3.0
Diff against target: 12 lines (+1/-1)
1 file modified
launcher/LauncherList.qml (+1/-1)
To merge this branch: bzr merge lp:~osomon/unity-2d/fix-shortcut-text-modulo-10
Reviewer Review Type Date Requested Status
Ugo Riboni (community) Approve
Review via email: mp+59527@code.launchpad.net

Commit message

[launcher] Fix the last shortcut text to display "0", not "10", to be consistent with a typical keyboard layout.

To post a comment you must log in.
Revision history for this message
Ugo Riboni (uriboni) wrote :

Works ok, and code is ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml 2011-04-18 10:12:51 +0000
+++ launcher/LauncherList.qml 2011-04-29 16:14:24 +0000
@@ -100,7 +100,7 @@
100100
101 shortcutVisible: item.toString().indexOf("LauncherApplication") == 0 &&101 shortcutVisible: item.toString().indexOf("LauncherApplication") == 0 &&
102 index <= 9 && launcherView.superKeyHeld102 index <= 9 && launcherView.superKeyHeld
103 shortcutText: index + 1103 shortcutText: (index + 1) % 10
104104
105 isBeingDragged: (reorder.draggedTileId != "") && (reorder.draggedTileId == desktopFile)105 isBeingDragged: (reorder.draggedTileId != "") && (reorder.draggedTileId == desktopFile)
106 dragPosition: reorder.listCoordinates.y - list.contentY106 dragPosition: reorder.listCoordinates.y - list.contentY

Subscribers

People subscribed via source and target branches