git.iko.soy/unity8
on xenial help sign in
Changed API call for activateAction
commit535c3a6c3edf57227f078c83f6d7f2652138c1df authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 1 Mar 2016, 12:28 (11 years ago) parentdc06b92
5 files changed+7−6
compare with xenial
unifiedsplit
qml/Dash/CardGrid.qml+1−1 qml/Dash/CardHorizontalList.qml+1−1 qml/Dash/CardVerticalJournal.qml+1−1 qml/Dash/DashRenderer.qml+2−1 qml/Dash/GenericScopeView.qml+2−2
qml/Dash/CardGrid.qml+1−1
@@ -79,7 +79,7 @@ DashRenderer {
7979 target: loader.item
8080 onClicked: root.clicked(index, result, loader.item, model)
8181 onPressAndHold: root.pressAndHold(index, result, model)
82− onAction: root.action(index, actionId)
82+ onAction: root.action(index, result, actionId)
8383 }
8484 }
8585 }
qml/Dash/CardHorizontalList.qml+1−1
@@ -60,7 +60,7 @@ DashRenderer {
6060 target: loader.item
6161 onClicked: root.clicked(index, result, loader.item, model)
6262 onPressAndHold: root.pressAndHold(index, result, model)
63− onAction: root.action(index, actionId)
63+ onAction: root.action(index, result, actionId)
6464 }
6565 }
6666 }
qml/Dash/CardVerticalJournal.qml+1−1
@@ -79,7 +79,7 @@ DashRenderer {
7979 target: loader.item
8080 onClicked: root.clicked(index, result, loader.item, model)
8181 onPressAndHold: root.pressAndHold(index, result, model)
82− onAction: root.action(index, actionId)
82+ onAction: root.action(index, result, actionId)
8383 }
8484 }
8585 }
qml/Dash/DashRenderer.qml+2−1
@@ -60,6 +60,7 @@ Item {
6060
6161 /// Emitted when the user clicked on an item action
6262 /// @param index is the index of the clicked item
63+ /// @param result result model of the clicked item, used for activation
6364 /// @param actionId id of the clicked action
64− signal action(int index, var actionId)
65+ signal action(int index, var result, var actionId)
6566}
qml/Dash/GenericScopeView.qml+2−2
@@ -407,8 +407,8 @@ FocusScope {
407407 scopeView.itemPressedAndHeld(index, result, target.model, categoryItemCount(), baseItem.category);
408408 }
409409
410− onAction: { // (int index, var actionId)
411− scopeview.activateAction(index, baseitem.categoryId, actionId);
410+ onAction: { // (int index, var result, var actionId)
411+ scope.activateAction(result, baseitem.categoryId, actionId);
412412 }
413413
414414 function categoryItemCount() {