b6020f0 · unity8 · git.iko.soy

35 onSetCurrentScopeRequested: {

36 if (!isSwipe || !window.active || overviewController.progress != 0) {

37 if (overviewController.progress != 0 && window.active) animate = false;

38− dash.setCurrentScope(index, animate, isSwipe)

38+ dashContent.setCurrentScopeAtIndex(scopeIndex, animate, isSwipe)

39 if (overviewController.progress != 0) {

40 if (window.active) {

41 dashContentCache.scheduleUpdate();

48 }

49 }

50

51− function setCurrentScope(scopeIndex, animate, reset) {

51+ function setCurrentScope(scopeId, animate, reset) {

52+ var scopeIndex = -1;

52− if (scopeIndex < 0 || scopeIndex >= scopes.count) {

53+ for (var i = 0; i < scopes.count; ++i) {

54+ if (scopes.getScope(i).id == scopeId) {

55+ scopeIndex = i;

56+ break;

57+ }

58+ }

59+

60+ if (scopeIndex == -1) {

53− console.warn("No scope with index: %1".arg(scopeIndex))

61+ console.warn("No match for scope with id: %1".arg(scopeId))

54 return

62 return

55 }

63 }

56

64