Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 04:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(BRIDGE-240): fix user contribution to match our QML naming convention.

Browse Source
This commit is contained in:
Xavier Michelon
2024-10-28 16:06:19 +01:00
parent 96e0070ed2
commit 19a445e73a
4 changed files with 5 additions and 5 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 implicitWidth: 600 // contentLayout.implicitWidth + contentLayout.anchors.leftMargin + contentLayout.anchors.rightMargin
leftMargin: (mainWindow.width - root.implicitWidth) / 2 leftMargin: (mainWindow.width - root.implicitWidth) / 2
modal: false modal: false
popupPrio: ApplicationWindow.PopupPriority.Banner popupPriority: ApplicationWindow.PopupPriority.Banner
shouldShow: notification ? (notification.active && !notification.dismissed) : false shouldShow: notification ? (notification.active && !notification.dismissed) : false
topMargin: 37 topMargin: 37

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

@ -78,10 +78,10 @@ T.ApplicationWindow {
topmost = obj; topmost = obj;
break; break;
} }
if (topmost && (topmost.popupPrio > obj.popupPrio)) { if (topmost && (topmost.popupPriority > obj.popupPriority)) {
continue; continue;
} }
if (topmost && (topmost.popupPrio === obj.popupPrio) && (topmost.occurred > obj.occurred)) { if (topmost && (topmost.popupPriority === obj.popupPriority) && (topmost.occurred > obj.occurred)) {
continue; continue;
} }
topmost = obj; topmost = obj;

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

@ -21,7 +21,7 @@ T.Dialog {
property ColorScheme colorScheme property ColorScheme colorScheme
readonly property var occurred: shouldShow ? new Date() : undefined 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 property bool shouldShow: false
function close() { function close() {

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

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