yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

fix(BRIDGE-240): avoid name clash with 6.8-introduced popupType

Browse Source 
(cherry picked from commit 834a2f910a30086132d53004fd8f7d770925bdad)
This commit is contained in:
Cimbali
2024-10-23 13:26:43 +01:00
committed by Xavier Michelon
parent 516ff5206d
commit 96e0070ed2
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml
View File

@ -28,7 +28,7 @@ Popup {
implicitWidth: 600 // contentLayout.implicitWidth + contentLayout.anchors.leftMargin + contentLayout.anchors.rightMargin
leftMargin: (mainWindow.width - root.implicitWidth) / 2
modal: false
popupType: ApplicationWindow.PopupType.Banner
popupPrio: ApplicationWindow.PopupPriority.Banner
shouldShow: notification ? (notification.active && !notification.dismissed) : false
topMargin: 37

6
internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml
View File

@ -21,7 +21,7 @@ T.ApplicationWindow {
id: root
// popup priority based on types
enum PopupType {
enum PopupPriority {
Banner,
Dialog
}
@ -78,10 +78,10 @@ T.ApplicationWindow {
topmost = obj;
break;
}
if (topmost && (topmost.popupType > obj.popupType)) {
if (topmost && (topmost.popupPrio > obj.popupPrio)) {
continue;
}
if (topmost && (topmost.popupType === obj.popupType) && (topmost.occurred > obj.occurred)) {
if (topmost && (topmost.popupPrio === obj.popupPrio) && (topmost.occurred > obj.occurred)) {
continue;
}
topmost = obj;

2
internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml
View File

@ -21,7 +21,7 @@ T.Dialog {
property ColorScheme colorScheme
readonly property var occurred: shouldShow ? new Date() : undefined
readonly property int popupType: ApplicationWindow.PopupType.Dialog
readonly property int popupPrio: ApplicationWindow.PopupPriority.Dialog
property bool shouldShow: false
function close() {

2
internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml
View File

@ -21,7 +21,7 @@ T.Popup {
property ColorScheme colorScheme
readonly property var occurred: shouldShow ? new Date() : undefined
property int popupType: ApplicationWindow.PopupType.Banner
property int popupPrio: ApplicationWindow.PopupPriority.Banner
property bool shouldShow: false
function close() {