535c3a6 · unity8 · git.iko.soy

qml/Dash/CardGrid.qml+1−1

compare with xenial

unifiedsplit

@@ -79,7 +79,7 @@ DashRenderer {

79 target: loader.item

80 onClicked: root.clicked(index, result, loader.item, model)

81 onPressAndHold: root.pressAndHold(index, result, model)

82− onAction: root.action(index, actionId)

82+ onAction: root.action(index, result, actionId)

83 }

84 }

85 }

qml/Dash/CardHorizontalList.qml+1−1

@@ -60,7 +60,7 @@ DashRenderer {

60 target: loader.item

61 onClicked: root.clicked(index, result, loader.item, model)

62 onPressAndHold: root.pressAndHold(index, result, model)

63− onAction: root.action(index, actionId)

63+ onAction: root.action(index, result, actionId)

64 }

65 }

66 }

qml/Dash/CardVerticalJournal.qml+1−1

@@ -79,7 +79,7 @@ DashRenderer {

79 target: loader.item

80 onClicked: root.clicked(index, result, loader.item, model)

81 onPressAndHold: root.pressAndHold(index, result, model)

82− onAction: root.action(index, actionId)

82+ onAction: root.action(index, result, actionId)

83 }

84 }

85 }

qml/Dash/DashRenderer.qml+2−1

@@ -60,6 +60,7 @@ Item {

60

61 /// Emitted when the user clicked on an item action

62 /// @param index is the index of the clicked item

63+ /// @param result result model of the clicked item, used for activation

63 /// @param actionId id of the clicked action

64 /// @param actionId id of the clicked action

64− signal action(int index, var actionId)

65+ signal action(int index, var result, var actionId)

65}

66}

qml/Dash/GenericScopeView.qml+2−2

@@ -407,8 +407,8 @@ FocusScope {

407 scopeView.itemPressedAndHeld(index, result, target.model, categoryItemCount(), baseItem.category);

408 }

409

410− onAction: { // (int index, var actionId)

410+ onAction: { // (int index, var result, var actionId)

411− scopeview.activateAction(index, baseitem.categoryId, actionId);

411+ scope.activateAction(result, baseitem.categoryId, actionId);

412 }

413

414 function categoryItemCount() {