From 19a445e73afb901dafc508ce935696ff024a166a Mon Sep 17 00:00:00 2001 From: Xavier Michelon Date: Mon, 28 Oct 2024 16:06:19 +0100 Subject: [PATCH] fix(BRIDGE-240): fix user contribution to match our QML naming convention. --- internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml | 2 +- .../bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml | 4 ++-- internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml | 2 +- internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml index 88d3a48a..f002c733 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml @@ -28,7 +28,7 @@ Popup { implicitWidth: 600 // contentLayout.implicitWidth + contentLayout.anchors.leftMargin + contentLayout.anchors.rightMargin leftMargin: (mainWindow.width - root.implicitWidth) / 2 modal: false - popupPrio: ApplicationWindow.PopupPriority.Banner + popupPriority: ApplicationWindow.PopupPriority.Banner shouldShow: notification ? (notification.active && !notification.dismissed) : false topMargin: 37 diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml index 72207896..755f8e6b 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml @@ -78,10 +78,10 @@ T.ApplicationWindow { topmost = obj; break; } - if (topmost && (topmost.popupPrio > obj.popupPrio)) { + if (topmost && (topmost.popupPriority > obj.popupPriority)) { continue; } - if (topmost && (topmost.popupPrio === obj.popupPrio) && (topmost.occurred > obj.occurred)) { + if (topmost && (topmost.popupPriority === obj.popupPriority) && (topmost.occurred > obj.occurred)) { continue; } topmost = obj; diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml index 30e7a99d..8e063ded 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml @@ -21,7 +21,7 @@ T.Dialog { property ColorScheme colorScheme readonly property var occurred: shouldShow ? new Date() : undefined - readonly property int popupPrio: ApplicationWindow.PopupPriority.Dialog + readonly property int popupPriority: ApplicationWindow.PopupPriority.Dialog property bool shouldShow: false function close() { diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml index 78fa29c1..466e36f5 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml @@ -21,7 +21,7 @@ T.Popup { property ColorScheme colorScheme readonly property var occurred: shouldShow ? new Date() : undefined - property int popupPrio: ApplicationWindow.PopupPriority.Banner + property int popupPriority: ApplicationWindow.PopupPriority.Banner property bool shouldShow: false function close() {