Skip to content
Snippets Groups Projects
Commit 155355f4 authored by Prince Gupta's avatar Prince Gupta :speech_balloon: Committed by Jean-Baptiste Kempf
Browse files

qml: correctly handle focusReason in Network display

parent 7ac8ea70
No related branches found
No related tags found
1 merge request!598qml: minor fixes to NetworkBrowseDisplay
Pipeline #137369 passed with stages
in 23 minutes and 26 seconds
......@@ -28,7 +28,6 @@ Control {
id: control
property var path
signal homeButtonClicked
property var _contentModel
property var _menuModel
......@@ -37,6 +36,7 @@ Control {
readonly property int minimumWidth: VLCStyle.bannerTabButton_width_large
signal browse(var tree, int reason)
signal homeButtonClicked(int reason)
onPathChanged: createContentModel()
onAvailableWidthChanged: createContentModel()
......@@ -95,7 +95,7 @@ Control {
Keys.priority: Keys.AfterItem
Keys.onPressed: Navigation.defaultKeyAction(event)
onClicked: control.homeButtonClicked()
onClicked: control.homeButtonClicked(focusReason)
}
AddressbarButton {
......
......@@ -121,7 +121,11 @@ Widgets.PageLoader {
NetworkAddressbar {
path: view === "browse" ? root.stackView.currentItem.providerModel.path : []
onHomeButtonClicked: history.push(["mc", "network", "home"])
onHomeButtonClicked: {
history.push(["mc", "network", "home"])
stackView.currentItem.setCurrentItemFocus(reason)
}
onBrowse: {
history.push(["mc", "network", "browse", { "tree": tree }])
......
......@@ -63,18 +63,26 @@ Widgets.PageLoader {
NetworkBrowseDisplay {
property alias source_name: deviceModel.source_name
property Component addressBar: NetworkAddressbar {
path: [{display: deviceModel.name, tree: {}}]
onHomeButtonClicked: history.push(["mc", "discover", "services"])
onHomeButtonClicked: {
history.push(["mc", "discover", "services"])
stackView.currentItem.setCurrentItemFocus(reason)
}
}
providerModel: deviceModel
contextMenu: contextMenu
onBrowse: history.push(["mc", "discover", "services", "source_browse",
{ tree: tree,
"root_name": deviceModel.name, "source_name": source_name }])
onBrowse: {
history.push(["mc", "discover", "services", "source_browse",
{ tree: tree, "root_name": deviceModel.name, "source_name": source_name }])
stackView.currentItem.setCurrentItemFocus(reason)
}
NetworkDeviceModel {
id: deviceModel
......@@ -105,13 +113,19 @@ Widgets.PageLoader {
return _path
}
onHomeButtonClicked: history.push(["mc", "discover", "services"])
onHomeButtonClicked: {
history.push(["mc", "discover", "services"])
stackView.currentItem.setCurrentItemFocus(reason)
}
onBrowse: {
if (!!tree.isRoot)
history.push(["mc", "discover", "services", "source_root", { source_name: tree.source_name }])
else
history.push(["mc", "discover", "services", "source_browse", { tree: tree, "root": root_name }]);
history.push(["mc", "discover", "services", "source_browse", { tree: tree, "root": root_name }])
stackView.currentItem.setCurrentItemFocus(reason)
}
}
......@@ -123,8 +137,12 @@ Widgets.PageLoader {
model: providerModel
}
onBrowse: history.push(["mc", "discover", "services", "source_browse",
onBrowse: {
history.push(["mc", "discover", "services", "source_browse",
{ tree: tree, "root": root_name }])
stackView.currentItem.setCurrentItemFocus(reason)
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment