From 99ad4130d99619c095cc3eaf78e3f76eff6c16a7 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Sat, 26 Nov 2022 15:30:11 +0100 Subject: [PATCH] Disable DropArea in flatpak The droparea doesn't support flatpak and dropping something leads to a crash BUG: 455990 --- src/controller.cpp | 9 +++++++++ src/controller.h | 2 ++ src/qml/Page/RoomPage.qml | 1 + 3 files changed, 12 insertions(+) diff --git a/src/controller.cpp b/src/controller.cpp index 2b8f1562a..4f28aae94 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -849,3 +849,12 @@ int Controller::quotientMinorVersion() const return 6; #endif } + +bool Controller::isFlatpak() const +{ +#ifdef NEOCHAT_FLATPAK + return true; +#else + return false; +#endif +} diff --git a/src/controller.h b/src/controller.h index a1722944b..2ae6e2ada 100644 --- a/src/controller.h +++ b/src/controller.h @@ -41,6 +41,7 @@ class Controller : public QObject Q_PROPERTY(bool encryptionSupported READ encryptionSupported CONSTANT) Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex NOTIFY activeConnectionIndexChanged) Q_PROPERTY(int quotientMinorVersion READ quotientMinorVersion CONSTANT) + Q_PROPERTY(bool isFlatpak READ isFlatpak CONSTANT) public: static Controller &instance(); @@ -101,6 +102,7 @@ public: Q_INVOKABLE void setApplicationProxy(); int quotientMinorVersion() const; + bool isFlatpak() const; private: explicit Controller(QObject *parent = nullptr); diff --git a/src/qml/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml index db1254f5d..b3a0875de 100644 --- a/src/qml/Page/RoomPage.qml +++ b/src/qml/Page/RoomPage.qml @@ -389,6 +389,7 @@ Kirigami.ScrollablePage { id: dropAreaFile anchors.fill: parent onDropped: currentRoom.chatBoxAttachmentPath = drop.urls[0]; + enabled: !Controller.isFlatpak } QQC2.Pane {