AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix list view focus moving on PageShare

Browse source
This commit is contained in:
Cyril Anisimov 2024-12-15 23:14:52 +01:00
parent 10e91b06f4
commit 62be292833
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/ui/qml/Pages2/PageShare.qml
View file

@ -343,8 +343,8 @@ PageType {
clickedFunction: function() { clickedFunction: function() {
handler() handler()
if (serverSelector.selectedIndex !== serverSelectorListView.selectedIndex) { if (serverSelector.currentIndex !== serverSelectorListView.selectedIndex) {
serverSelector.selectedIndex = serverSelectorListView.currentIndex serverSelector.currentIndex = serverSelectorListView.selectedIndex
serverSelector.severSelectorIndexChanged() serverSelector.severSelectorIndexChanged()
} }
@ -353,9 +353,9 @@ PageType {
Component.onCompleted: { Component.onCompleted: {
if (ServersModel.isDefaultServerHasWriteAccess() && ServersModel.getDefaultServerData("hasInstalledContainers")) { if (ServersModel.isDefaultServerHasWriteAccess() && ServersModel.getDefaultServerData("hasInstalledContainers")) {
serverSelectorListView.currentIndex = proxyServersModel.mapFromSource(ServersModel.defaultIndex) serverSelectorListView.selectedIndex = proxyServersModel.mapFromSource(ServersModel.defaultIndex)
} else { } else {
serverSelectorListView.currentIndex = 0 serverSelectorListView.selectedIndex = 0
} }
serverSelectorListView.triggerCurrentItem() serverSelectorListView.triggerCurrentItem()
@ -363,7 +363,7 @@ PageType {
function handler() { function handler() {
serverSelector.text = selectedText serverSelector.text = selectedText
ServersModel.processedIndex = proxyServersModel.mapToSource(currentIndex) ServersModel.processedIndex = proxyServersModel.mapToSource(selectedIndex)
} }
} }
} }
@ -401,8 +401,6 @@ PageType {
] ]
} }
currentIndex: 0
clickedFunction: function() { clickedFunction: function() {
handler() handler()
@ -414,7 +412,7 @@ PageType {
function onSeverSelectorIndexChanged() { function onSeverSelectorIndexChanged() {
var defaultContainer = proxyContainersModel.mapFromSource(ServersModel.getProcessedServerData("defaultContainer")) var defaultContainer = proxyContainersModel.mapFromSource(ServersModel.getProcessedServerData("defaultContainer"))
protocolSelectorListView.currentIndex = defaultContainer protocolSelectorListView.selectedIndex = defaultContainer
protocolSelectorListView.triggerCurrentItem() protocolSelectorListView.triggerCurrentItem()
} }
} }
@ -429,7 +427,7 @@ PageType {
protocolSelector.text = selectedText protocolSelector.text = selectedText
ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex)) ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(selectedIndex))
fillConnectionTypeModel() fillConnectionTypeModel()
@ -444,7 +442,7 @@ PageType {
function fillConnectionTypeModel() { function fillConnectionTypeModel() {
root.connectionTypesModel = [amneziaConnectionFormat] root.connectionTypesModel = [amneziaConnectionFormat]
var index = proxyContainersModel.mapToSource(currentIndex) var index = proxyContainersModel.mapToSource(selectedIndex)
if (index === ContainerProps.containerFromString("amnezia-openvpn")) { if (index === ContainerProps.containerFromString("amnezia-openvpn")) {
root.connectionTypesModel.push(openVpnConnectionFormat) root.connectionTypesModel.push(openVpnConnectionFormat)