05e8cb5 · unity8 · git.iko.soy

on xenial help sign in

further improve highlight movement

05e8cb5Michael Zanetti12 years ago

qml/Stages/DesktopStage.qml+8−2

@@ -46,7 +46,10 @@ FocusScope {

46 if (root.altTabPressed) {

47 print("should tab next")

48 appRepeater.highlightedIndex = (appRepeater.highlightedIndex + 1) % ApplicationManager.count;

49− spreadFlickable.snapTo(spreadFlickable.width / 5 * Math.max(0, Math.min(ApplicationManager.count - 5, appRepeater.highlightedIndex - 3)))

49+ var newContentX = spreadFlickable.width / 5 * Math.max(0, Math.min(ApplicationManager.count - 5, appRepeater.highlightedIndex - 3));

50+ if (spreadFlickable.contentX < newContentX) {

51+ spreadFlickable.snapTo(newContentX)

52+ }

50 }

53 }

51 }

54 }

@@ -55,7 +58,10 @@ FocusScope {

55 if (root.altTabPressed) {

58 if (root.altTabPressed) {

56 var newIndex = appRepeater.highlightedIndex - 1 >= 0 ? appRepeater.highlightedIndex - 1 : ApplicationManager.count - 1;

59 var newIndex = appRepeater.highlightedIndex - 1 >= 0 ? appRepeater.highlightedIndex - 1 : ApplicationManager.count - 1;

57 appRepeater.highlightedIndex = newIndex;

60 appRepeater.highlightedIndex = newIndex;

58− spreadFlickable.snapTo(spreadFlickable.width / 5 * Math.max(0, Math.min(ApplicationManager.count - 5, appRepeater.highlightedIndex - 1)))

61+ var newContentX = spreadFlickable.width / 5 * Math.max(0, Math.min(ApplicationManager.count - 5, appRepeater.highlightedIndex - 1));

62+ if (spreadFlickable.contentX > newContentX) {

63+ spreadFlickable.snapTo(newContentX)

64+ }

59 }

65 }

60 }

66 }