Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix qt crash #502

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix qt crash #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5615176
Fix ColorImage Qt crash
Cimbali Oct 23, 2024
834a2f9
Avoid name clash with 6.8-introduced popupType
Cimbali Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions internal/frontend/bridge-gui/bridge-gui/qml/BugReport/QuestionItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import Proton

Item {
Expand Down
6 changes: 3 additions & 3 deletions internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ T.ApplicationWindow {
id: root

// popup priority based on types
enum PopupType {
enum PopupPriority {
Banner,
Dialog
}
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 1 addition & 0 deletions internal/frontend/bridge-gui/bridge-gui/qml/Proton/InfoTooltip.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.impl
import QtQuick.Layouts

ColorImage {
Expand Down
1 change: 1 addition & 0 deletions internal/frontend/bridge-gui/bridge-gui/qml/Proton/LinkLabel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.impl
import QtQuick.Layouts

RowLayout {
Expand Down
2 changes: 1 addition & 1 deletion internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 1 addition & 0 deletions internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigCertInstall.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl

Item {
id: root
Expand Down
1 change: 1 addition & 0 deletions internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigParameters.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import ".."

Rectangle {
Expand Down
1 change: 1 addition & 0 deletions internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientListItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl

Rectangle {
id: root
Expand Down
1 change: 1 addition & 0 deletions internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Login.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl

FocusScope {
id: root
Expand Down