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

fixed screen fade when switching from PageSetupWizardStart to PageStart

Browse source
This commit is contained in:
vladimir.kuznetsov 2024-03-06 14:22:44 +05:00
parent 6b6a76d2cc
commit 9201ca1e03
3 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/ui/qml/Pages2/PageSetupWizardStart.qml
View file

@ -22,10 +22,6 @@ PageType {
PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
}
function onShowBusyIndicator(visible) {
busyIndicator.visible = visible
}
function onClosePage() {
if (stackView.depth <= 1) {
return
@ -53,7 +49,7 @@ PageType {
}
function onEscapePressed() {
if (isControlsDisabled || busyIndicator.visible) {
if (isControlsDisabled) {
return
}
@ -159,10 +155,4 @@ PageType {
ConnectionTypeSelectionDrawer {
id: connectionTypeSelection
}
BusyIndicatorType {
id: busyIndicator
anchors.centerIn: parent
z: 1
}
}

22
client/ui/qml/Pages2/PageStart.qml
View file

@ -14,6 +14,8 @@ import "../Components"
PageType {
id: root
property bool isControlsDisabled: false
Connections {
target: PageController
@ -32,14 +34,8 @@ PageType {
tabBarStackView.push(pagePath, { "objectName" : pagePath }, StackView.PushTransition)
}
function onShowBusyIndicator(visible) {
busyIndicator.visible = visible
tabBarStackView.enabled = !visible
tabBar.enabled = !visible
}
function onDisableControls(disabled) {
tabBar.enabled = !disabled
isControlsDisabled = disabled
}
function onClosePage() {
@ -67,7 +63,7 @@ PageType {
}
function onEscapePressed() {
if (!tabBar.enabled || busyIndicator.visible) {
if (root.isControlsDisabled) {
return
}
@ -136,6 +132,8 @@ PageType {
width: parent.width
height: root.height - tabBar.implicitHeight
enabled: !root.isControlsDisabled
function goToTabBarPage(page) {
connectionTypeSelection.close()
@ -165,6 +163,8 @@ PageType {
leftPadding: 96
rightPadding: 96
enabled: !root.isControlsDisabled
background: Shape {
width: parent.width
height: parent.height
@ -236,12 +236,6 @@ PageType {
}
}
BusyIndicatorType {
id: busyIndicator
anchors.centerIn: parent
z: 1
}
ConnectionTypeSelectionDrawer {
id: connectionTypeSelection