Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-18 16:17:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1062: Fix lost notification bar when window is closed

Browse Source
This commit is contained in:
Alexander Bilyak
2021-02-24 00:54:07 +01:00
committed by Jakub Cuth
parent feeb7179f5
commit fd73ec6861
6 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
internal/frontend/qml/Gui.qml
View File

@ -107,17 +107,21 @@ Item {
gui.openMainWindow(false)
if (go.isConnectionOK) {
if( winMain.updateState=="noInternet") {
go.setUpdateState("upToDate")
go.updateState = "upToDate"
}
} else {
go.setUpdateState("noInternet")
go.updateState = "noInternet"
}
}
onSetUpdateState : {
onUpdateStateChanged : {
// if main window is closed - most probably it is destroyed (see closeMainWindow())
if (winMain == null) {
return
}
// once app is outdated prevent from state change
if (winMain.updateState != "forceUpdate") {
winMain.updateState = updateState
winMain.updateState = go.updateState
}
}
@ -129,15 +133,14 @@ Item {
}
onNotifyManualUpdate: {
go.setUpdateState("oldVersion")
go.updateState = "oldVersion"
}
onNotifyManualUpdateRestartNeeded: {
if (!winMain.dialogUpdate.visible) {
gui.openMainWindow(true)
winMain.dialogUpdate.show()
}
go.setUpdateState("updateRestart")
go.updateState = "updateRestart"
winMain.dialogUpdate.finished(false)
// after manual update - just retart immidiatly
@ -147,28 +150,25 @@ Item {
onNotifyManualUpdateError: {
if (!winMain.dialogUpdate.visible) {
gui.openMainWindow(true)
winMain.dialogUpdate.show()
}
go.setUpdateState("updateError")
go.updateState = "updateError"
winMain.dialogUpdate.finished(true)
}
onNotifyForceUpdate : {
go.setUpdateState("forceUpdate")
go.updateState = "forceUpdate"
if (!winMain.dialogUpdate.visible) {
gui.openMainWindow(true)
winMain.dialogUpdate.show()
}
}
onNotifySilentUpdateRestartNeeded: {
go.setUpdateState("updateRestart")
go.updateState = "updateRestart"
}
onNotifySilentUpdateError: {
go.setUpdateState("updateError")
gui.openMainWindow(true)
go.updateState = "updateError"
}
onNotifyLogout : {
@ -287,9 +287,17 @@ Item {
if (showAndRise) {
gui.winMain.showAndRise()
}
// restore update notification bar: trigger updateStateChanged
var tmp = go.updateState
go.updateState = ""
go.updateState = tmp
}
function closeMainWindow () {
// Historical reasons: once upon a time there was a report about high GPU
// usage on MacOS while bridge is closed. Legends say that destroying
// MainWindow solved this.
gui.winMain.hide()
gui.winMain.destroy(5000)
gui.winMain = null