From 0794f0a3fdc80f3316a206305a01a5356b1d270f Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 25 Jan 2021 23:46:55 -0500 Subject: Initial commit for privacy screen Missing window focus event and knowing when room is encryption --- resources/qml/PrivacyScreen.qml | 74 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 resources/qml/PrivacyScreen.qml (limited to 'resources/qml/PrivacyScreen.qml') diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml new file mode 100644 index 00000000..497630f1 --- /dev/null +++ b/resources/qml/PrivacyScreen.qml @@ -0,0 +1,74 @@ +import QtQuick 2.12 +import QtGraphicalEffects 1.0 + +Item { + property var timelineRoot + property var imageSource + property int screenTimeout + anchors.fill: parent + + Timer { + id: screenSaverTimer + interval: screenTimeout * 1000 + running: true + onTriggered: { + timelineRoot.grabToImage(function(result) { + imageSource = result.url; + screenSaver.visible = true + particles.resume() + }, Qt.size(width, height)) + } + } + + // Reset screensaver timer when clicks are received + MouseArea { + anchors.fill: parent + // Pass mouse events through + propagateComposedEvents: true + hoverEnabled: true + onClicked: { + screenSaverTimer.restart(); + mouse.accepted = false; + } + } + + Rectangle { + id: screenSaver + anchors.fill: parent + visible: false + color: "transparent" + + Image { + id: image + visible : screenSaver.visible + anchors.fill: parent + source: imageSource + } + + ShaderEffectSource { + id: effectSource + + sourceItem: image + anchors.fill: image + sourceRect: Qt.rect(0,0, width, height) + } + + FastBlur{ + id: blur + anchors.fill: effectSource + source: effectSource + radius: 50 + } + + MouseArea { + anchors.fill: parent + propagateComposedEvents: true + hoverEnabled: true + onClicked: { + screenSaver.visible = false; + screenSaverTimer.restart(); + mouse.accepted = false + } + } + } +} \ No newline at end of file -- cgit 1.5.1 From cb93ac3402a9b8d8862ce97d05386c52811166c5 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 26 Jan 2021 00:03:09 -0500 Subject: Fix formatting --- .ci/format.sh | 10 ++++++++++ resources/qml/PrivacyScreen.qml | 27 +++++++++++++++++---------- resources/qml/TimelineView.qml | 1 + src/UserSettingsPage.cpp | 26 ++++++++++++-------------- src/UserSettingsPage.h | 7 ++++--- 5 files changed, 44 insertions(+), 27 deletions(-) (limited to 'resources/qml/PrivacyScreen.qml') diff --git a/.ci/format.sh b/.ci/format.sh index e1e6c1e4..7f201bb8 100755 --- a/.ci/format.sh +++ b/.ci/format.sh @@ -14,4 +14,14 @@ do clang-format -i "$f" done; +QMLFORMAT_PATH=$(which qmlformat) +if [ ! -z "$QMLFORMAT_PATH" ]; then + QML_FILES=$(find resources -type f -iname "*.qml") + + for f in $QML_FILES + do + qmlformat -i "$f" + done; +fi + git diff --exit-code diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index 497630f1..9fdd35e0 100644 --- a/resources/qml/PrivacyScreen.qml +++ b/resources/qml/PrivacyScreen.qml @@ -1,22 +1,24 @@ -import QtQuick 2.12 import QtGraphicalEffects 1.0 +import QtQuick 2.12 Item { property var timelineRoot property var imageSource property int screenTimeout + anchors.fill: parent Timer { id: screenSaverTimer + interval: screenTimeout * 1000 running: true onTriggered: { timelineRoot.grabToImage(function(result) { imageSource = result.url; - screenSaver.visible = true - particles.resume() - }, Qt.size(width, height)) + screenSaver.visible = true; + particles.resume(); + }, Qt.size(width, height)); } } @@ -34,13 +36,15 @@ Item { Rectangle { id: screenSaver + anchors.fill: parent visible: false color: "transparent" Image { id: image - visible : screenSaver.visible + + visible: screenSaver.visible anchors.fill: parent source: imageSource } @@ -50,11 +54,12 @@ Item { sourceItem: image anchors.fill: image - sourceRect: Qt.rect(0,0, width, height) + sourceRect: Qt.rect(0, 0, width, height) } - FastBlur{ + FastBlur { id: blur + anchors.fill: effectSource source: effectSource radius: 50 @@ -64,11 +69,13 @@ Item { anchors.fill: parent propagateComposedEvents: true hoverEnabled: true - onClicked: { + onClicked: { screenSaver.visible = false; screenSaverTimer.restart(); - mouse.accepted = false + mouse.accepted = false; } } + } -} \ No newline at end of file + +} diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 5f43de55..35d09d5a 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -189,6 +189,7 @@ Page { ColumnLayout { id: timelineLayout + visible: TimelineManager.timeline != null anchors.fill: parent spacing: 0 diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 1875e4f9..a8558e95 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -87,16 +87,16 @@ UserSettings::load(std::optional profile) settings.value("user/timeline/message_hover_highlight", false).toBool(); enlargeEmojiOnlyMessages_ = settings.value("user/timeline/enlarge_emoji_only_msg", false).toBool(); - markdown_ = settings.value("user/markdown_enabled", true).toBool(); - typingNotifications_ = settings.value("user/typing_notifications", true).toBool(); - sortByImportance_ = settings.value("user/sort_by_unread", true).toBool(); - readReceipts_ = settings.value("user/read_receipts", true).toBool(); - theme_ = settings.value("user/theme", defaultTheme_).toString(); - font_ = settings.value("user/font_family", "default").toString(); - avatarCircles_ = settings.value("user/avatar_circles", true).toBool(); - decryptSidebar_ = settings.value("user/decrypt_sidebar", true).toBool(); - privacyScreen_ = settings.value("user/privacy_screen", false).toBool(); - privacyScreenTimeout_ = settings.value("user/privacy_screen_timeout", 0).toInt(); + markdown_ = settings.value("user/markdown_enabled", true).toBool(); + typingNotifications_ = settings.value("user/typing_notifications", true).toBool(); + sortByImportance_ = settings.value("user/sort_by_unread", true).toBool(); + readReceipts_ = settings.value("user/read_receipts", true).toBool(); + theme_ = settings.value("user/theme", defaultTheme_).toString(); + font_ = settings.value("user/font_family", "default").toString(); + avatarCircles_ = settings.value("user/avatar_circles", true).toBool(); + decryptSidebar_ = settings.value("user/decrypt_sidebar", true).toBool(); + privacyScreen_ = settings.value("user/privacy_screen", false).toBool(); + privacyScreenTimeout_ = settings.value("user/privacy_screen_timeout", 0).toInt(); shareKeysWithTrustedUsers_ = settings.value("user/share_keys_with_trusted_users", true).toBool(); mobileMode_ = settings.value("user/mobile_mode", false).toBool(); @@ -842,7 +842,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer settings, QWidge boxWrap(tr("Privacy screen timeout"), privacyScreenTimeout_, tr("Set timeout for how long after window loses\nfocus before the screen" - " will be blurred.\nSet to 0 to blur immediately after focus loss.")); + " will be blurred.\nSet to 0 to blur immediately after focus loss.")); boxWrap(tr("Show buttons in timeline"), timelineButtonsToggle_, tr("Show buttons to quickly reply, react or access additional options next to each " @@ -1168,9 +1168,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer settings, QWidge connect(privacyScreenTimeout_, qOverload(&QSpinBox::valueChanged), this, - [this](int newValue) { - settings_->setPrivacyScreenTimeout(newValue); - }); + [this](int newValue) { settings_->setPrivacyScreenTimeout(newValue); }); connect( sessionKeysImportBtn, &QPushButton::clicked, this, &UserSettingsPage::importSessionKeys); diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h index 7e475c3b..8654afcf 100644 --- a/src/UserSettingsPage.h +++ b/src/UserSettingsPage.h @@ -67,9 +67,10 @@ class UserSettings : public QObject bool avatarCircles READ avatarCircles WRITE setAvatarCircles NOTIFY avatarCirclesChanged) Q_PROPERTY(bool decryptSidebar READ decryptSidebar WRITE setDecryptSidebar NOTIFY decryptSidebarChanged) - Q_PROPERTY(bool privacyScreen READ privacyScreen WRITE setPrivacyScreen NOTIFY - privacyScreenChanged) - Q_PROPERTY(int privacyScreenTimeout READ privacyScreenTimeout WRITE setPrivacyScreenTimeout NOTIFY privacyScreenTimeoutChanged) + Q_PROPERTY( + bool privacyScreen READ privacyScreen WRITE setPrivacyScreen NOTIFY privacyScreenChanged) + Q_PROPERTY(int privacyScreenTimeout READ privacyScreenTimeout WRITE setPrivacyScreenTimeout + NOTIFY privacyScreenTimeoutChanged) Q_PROPERTY(int timelineMaxWidth READ timelineMaxWidth WRITE setTimelineMaxWidth NOTIFY timelineMaxWidthChanged) Q_PROPERTY(bool mobileMode READ mobileMode WRITE setMobileMode NOTIFY mobileModeChanged) -- cgit 1.5.1 From bfeb766a91e259dce7924fb0bbcfcac85b91092b Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 26 Jan 2021 17:23:28 -0500 Subject: Implement Privacy Screen * Add handles for window focus gained / focus lossed and connect to timer * Clean up some of the PrivacyScreen.qml code * Connect settings to PrivacyScreen visibility --- .ci/format.sh | 2 + resources/qml/PrivacyScreen.qml | 120 ++++++++++++++++++++++++++++--------- src/ChatPage.cpp | 2 + src/ChatPage.h | 2 +- src/MainWindow.cpp | 16 +++++ src/MainWindow.h | 4 ++ src/UserSettingsPage.cpp | 12 ++-- src/timeline/TimelineViewManager.h | 14 ++++- 8 files changed, 137 insertions(+), 35 deletions(-) (limited to 'resources/qml/PrivacyScreen.qml') diff --git a/.ci/format.sh b/.ci/format.sh index 7f201bb8..4df4282a 100755 --- a/.ci/format.sh +++ b/.ci/format.sh @@ -22,6 +22,8 @@ if [ ! -z "$QMLFORMAT_PATH" ]; then do qmlformat -i "$f" done; +else + echo "qmlformat not found; skipping qml formatting" fi git diff --exit-code diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index 9fdd35e0..45ae5cb5 100644 --- a/resources/qml/PrivacyScreen.qml +++ b/resources/qml/PrivacyScreen.qml @@ -1,13 +1,28 @@ import QtGraphicalEffects 1.0 import QtQuick 2.12 +import im.nheko 1.0 Item { + id: privacyScreen + property var timelineRoot - property var imageSource + property var imageSource: "" property int screenTimeout anchors.fill: parent + Connections { + target: TimelineManager + onFocusChanged: { + if (TimelineManager.isWindowFocused) { + screenSaverTimer.stop(); + screenSaver.state = "Invisible"; + } else { + screenSaverTimer.start(); + } + } + } + Timer { id: screenSaverTimer @@ -15,36 +30,98 @@ Item { running: true onTriggered: { timelineRoot.grabToImage(function(result) { + screenSaver.state = "Visible"; imageSource = result.url; - screenSaver.visible = true; - particles.resume(); }, Qt.size(width, height)); } } - // Reset screensaver timer when clicks are received - MouseArea { - anchors.fill: parent - // Pass mouse events through - propagateComposedEvents: true - hoverEnabled: true - onClicked: { - screenSaverTimer.restart(); - mouse.accepted = false; - } - } - Rectangle { id: screenSaver + state: "Invisible" anchors.fill: parent visible: false color: "transparent" + states: [ + State { + name: "Visible" + + PropertyChanges { + target: screenSaver + visible: true + } + + PropertyChanges { + target: screenSaver + opacity: 1 + } + + }, + State { + name: "Invisible" + + PropertyChanges { + target: screenSaver + opacity: 0 + } + + PropertyChanges { + target: screenSaver + visible: false + } + + } + ] + transitions: [ + Transition { + from: "Visible" + to: "Invisible" + + SequentialAnimation { + NumberAnimation { + target: screenSaver + property: "opacity" + duration: 250 + easing.type: Easing.InQuad + } + + NumberAnimation { + target: screenSaver + property: "visible" + duration: 0 + } + + } + + }, + Transition { + from: "Invisible" + to: "Visible" + + SequentialAnimation { + NumberAnimation { + target: screenSaver + property: "visible" + duration: 0 + } + + NumberAnimation { + target: screenSaver + property: "opacity" + duration: 500 + easing.type: Easing.InQuad + } + + } + + } + ] Image { id: image - visible: screenSaver.visible + cache: false anchors.fill: parent source: imageSource } @@ -65,17 +142,6 @@ Item { radius: 50 } - MouseArea { - anchors.fill: parent - propagateComposedEvents: true - hoverEnabled: true - onClicked: { - screenSaver.visible = false; - screenSaverTimer.restart(); - mouse.accepted = false; - } - } - } } diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 0377ce30..5bbfa351 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -312,6 +312,8 @@ ChatPage::ChatPage(QSharedPointer userSettings, QWidget *parent) &ChatPage::initializeMentions, user_mentions_popup_, &popups::UserMentions::initializeMentions); + connect( + this, &ChatPage::chatFocusChanged, view_manager_, &TimelineViewManager::chatFocusChanged); connect(this, &ChatPage::syncUI, this, [this](const mtx::responses::Rooms &rooms) { try { room_list_->cleanupInvites(cache::invites()); diff --git a/src/ChatPage.h b/src/ChatPage.h index 0516f87d..917bd785 100644 --- a/src/ChatPage.h +++ b/src/ChatPage.h @@ -127,7 +127,6 @@ public slots: void receivedSessionKey(const std::string &room_id, const std::string &session_id); void decryptDownloadedSecrets(mtx::secret_storage::AesHmacSha2KeyDescription keyDesc, const SecretsToDecrypt &secrets); - signals: void connectionLost(); void connectionRestored(); @@ -176,6 +175,7 @@ signals: void retrievedPresence(const QString &statusMsg, mtx::presence::PresenceState state); void themeChanged(); void decryptSidebarChanged(); + void chatFocusChanged(const bool focused); //! Signals for device verificaiton void receivedDeviceVerificationAccept( diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 77269008..8fd5c7e2 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -130,6 +130,9 @@ MainWindow::MainWindow(QWidget *parent) SLOT(iconActivated(QSystemTrayIcon::ActivationReason))); connect(chat_page_, SIGNAL(contentLoaded()), this, SLOT(removeOverlayProgressBar())); + + connect(this, &MainWindow::focusChanged, chat_page_, &ChatPage::chatFocusChanged); + connect( chat_page_, &ChatPage::showUserSettingsPage, this, &MainWindow::showUserSettingsPage); @@ -204,6 +207,19 @@ MainWindow::resizeEvent(QResizeEvent *event) QMainWindow::resizeEvent(event); } +bool +MainWindow::event(QEvent *event) +{ + auto type = event->type(); + if (type == QEvent::WindowActivate) { + emit focusChanged(true); + } else if (type == QEvent::WindowDeactivate) { + emit focusChanged(false); + } + + return QMainWindow::event(event); +} + void MainWindow::adjustSideBars() { diff --git a/src/MainWindow.h b/src/MainWindow.h index 0915a849..4560ec65 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -88,6 +88,7 @@ protected: void closeEvent(QCloseEvent *event) override; void resizeEvent(QResizeEvent *event) override; void showEvent(QShowEvent *event) override; + bool event(QEvent *event) override; private slots: //! Show or hide the sidebars based on window's size. @@ -115,6 +116,9 @@ private slots: virtual void setWindowTitle(int notificationCount); +signals: + void focusChanged(const bool focused); + private: bool loadJdenticonPlugin(); diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index a8558e95..c26bf2e9 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -836,13 +836,15 @@ UserSettingsPage::UserSettingsPage(QSharedPointer settings, QWidge decryptSidebar_, tr("Decrypt the messages shown in the sidebar.\nOnly affects messages in " "encrypted chats.")); - boxWrap(tr("Encrypted chat privacy screen"), + boxWrap(tr("Privacy Screen"), privacyScreen_, tr("When the window loses focus, the timeline will\nbe blurred.")); - boxWrap(tr("Privacy screen timeout"), - privacyScreenTimeout_, - tr("Set timeout for how long after window loses\nfocus before the screen" - " will be blurred.\nSet to 0 to blur immediately after focus loss.")); + boxWrap( + tr("Privacy screen timeout"), + privacyScreenTimeout_, + tr("Set timeout (in seconds) for how long after window loses\nfocus before the screen" + " will be blurred.\nSet to 0 to blur immediately after focus loss. Max value of 1 " + "hour (3600 seconds)")); boxWrap(tr("Show buttons in timeline"), timelineButtonsToggle_, tr("Show buttons to quickly reply, react or access additional options next to each " diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h index 23a960b8..74128865 100644 --- a/src/timeline/TimelineViewManager.h +++ b/src/timeline/TimelineViewManager.h @@ -36,6 +36,8 @@ class TimelineViewManager : public QObject bool isInitialSync MEMBER isInitialSync_ READ isInitialSync NOTIFY initialSyncChanged) Q_PROPERTY( bool isNarrowView MEMBER isNarrowView_ READ isNarrowView NOTIFY narrowViewChanged) + Q_PROPERTY( + bool isWindowFocused MEMBER isWindowFocused_ READ isWindowFocused NOTIFY focusChanged) public: TimelineViewManager(CallManager *callManager, ChatPage *parent = nullptr); @@ -54,6 +56,7 @@ public: Q_INVOKABLE TimelineModel *activeTimeline() const { return timeline_; } Q_INVOKABLE bool isInitialSync() const { return isInitialSync_; } bool isNarrowView() const { return isNarrowView_; } + bool isWindowFocused() const { return isWindowFocused_; } Q_INVOKABLE void openImageOverlay(QString mxcUrl, QString eventId) const; Q_INVOKABLE QColor userColor(QString id, QColor background); Q_INVOKABLE QString escapeEmoji(QString str) const; @@ -83,11 +86,17 @@ signals: void inviteUsers(QStringList users); void showRoomList(); void narrowViewChanged(); + void focusChanged(); public slots: void updateReadReceipts(const QString &room_id, const std::vector &event_ids); void receivedSessionKey(const std::string &room_id, const std::string &session_id); void initWithMessages(const std::vector &roomIds); + void chatFocusChanged(bool focused) + { + isWindowFocused_ = focused; + emit focusChanged(); + } void setHistoryView(const QString &room_id); TimelineModel *getHistoryView(const QString &room_id) @@ -145,8 +154,9 @@ private: TimelineModel *timeline_ = nullptr; CallManager *callManager_ = nullptr; - bool isInitialSync_ = true; - bool isNarrowView_ = false; + bool isInitialSync_ = true; + bool isNarrowView_ = false; + bool isWindowFocused_ = false; QHash userColors; -- cgit 1.5.1 From d59910a8f298b13cc90e436a6f6efa325d863180 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 1 Feb 2021 18:42:18 -0500 Subject: Remove redundant import and fix visible warning --- resources/qml/PrivacyScreen.qml | 10 ++++++---- resources/qml/TimelineView.qml | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'resources/qml/PrivacyScreen.qml') diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index 45ae5cb5..14a175f9 100644 --- a/resources/qml/PrivacyScreen.qml +++ b/resources/qml/PrivacyScreen.qml @@ -29,10 +29,12 @@ Item { interval: screenTimeout * 1000 running: true onTriggered: { - timelineRoot.grabToImage(function(result) { - screenSaver.state = "Visible"; - imageSource = result.url; - }, Qt.size(width, height)); + if (MainWindow.visible) { + timelineRoot.grabToImage(function(result) { + screenSaver.state = "Visible"; + imageSource = result.url; + }, Qt.size(width, height)); + } } } diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 35d09d5a..379b19fb 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -1,4 +1,3 @@ -import "." import "./delegates" import "./device-verification" import "./emoji" -- cgit 1.5.1 From 1127aa7c91718ceec82ac0a775935b62b5220724 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 1 Feb 2021 18:57:59 -0500 Subject: Small UX fixes --- resources/qml/PrivacyScreen.qml | 4 +++- src/MainWindow.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'resources/qml/PrivacyScreen.qml') diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index 14a175f9..f3e388ce 100644 --- a/resources/qml/PrivacyScreen.qml +++ b/resources/qml/PrivacyScreen.qml @@ -18,7 +18,9 @@ Item { screenSaverTimer.stop(); screenSaver.state = "Invisible"; } else { - screenSaverTimer.start(); + if (timelineRoot.visible) { + screenSaverTimer.start(); + } } } } diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 8fd5c7e2..ab3c2cf2 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -59,6 +59,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) , userSettings_{UserSettings::instance()} { + instance_ = this; + setWindowTitle(0); setObjectName("MainWindow"); @@ -312,8 +314,6 @@ MainWindow::showChatPage() &Cache::secretChanged, userSettingsPage_, &UserSettingsPage::updateSecretStatus); - - instance_ = this; } void -- cgit 1.5.1 From 2bfd44755ea9c18ee9fc48e775b97f0363c9acd4 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 2 Feb 2021 11:37:10 -0500 Subject: Try to fix format script and fix linting --- .ci/format.sh | 4 ++-- resources/qml/PrivacyScreen.qml | 8 ++++---- resources/qml/UserProfile.qml | 17 ++++++++--------- 3 files changed, 14 insertions(+), 15 deletions(-) (limited to 'resources/qml/PrivacyScreen.qml') diff --git a/.ci/format.sh b/.ci/format.sh index f2d01cec..31eba878 100755 --- a/.ci/format.sh +++ b/.ci/format.sh @@ -14,13 +14,13 @@ do clang-format -i "$f" done; -QMLFORMAT_PATH=$(which qmlformat) +QMLFORMAT_PATH=$(command -v qmlformat) if [ -n "$QMLFORMAT_PATH" ]; then QML_FILES=$(find resources -type f -iname "*.qml") for f in $QML_FILES do - qmlformat -i "$f" + $QMLFORMAT_PATH -i "$f" done; else echo "qmlformat not found; skipping qml formatting" diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index f3e388ce..98c802a0 100644 --- a/resources/qml/PrivacyScreen.qml +++ b/resources/qml/PrivacyScreen.qml @@ -18,9 +18,9 @@ Item { screenSaverTimer.stop(); screenSaver.state = "Invisible"; } else { - if (timelineRoot.visible) { + if (timelineRoot.visible) screenSaverTimer.start(); - } + } } } @@ -31,12 +31,12 @@ Item { interval: screenTimeout * 1000 running: true onTriggered: { - if (MainWindow.visible) { + if (MainWindow.visible) timelineRoot.grabToImage(function(result) { screenSaver.state = "Visible"; imageSource = result.url; }, Qt.size(width, height)); - } + } } diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml index 4cb9eb10..4a402b69 100644 --- a/resources/qml/UserProfile.qml +++ b/resources/qml/UserProfile.qml @@ -53,10 +53,9 @@ ApplicationWindow { font.bold: true Layout.alignment: Qt.AlignHCenter selectByMouse: true - onAccepted: { - profile.changeUsername(displayUsername.text) - displayUsername.isUsernameEditingAllowed = false + profile.changeUsername(displayUsername.text); + displayUsername.isUsernameEditingAllowed = false; } ImageButton { @@ -65,18 +64,18 @@ ApplicationWindow { anchors.left: displayUsername.right anchors.verticalCenter: displayUsername.verticalCenter image: displayUsername.isUsernameEditingAllowed ? ":/icons/icons/ui/checkmark.png" : ":/icons/icons/ui/edit.png" - onClicked: { if (displayUsername.isUsernameEditingAllowed) { - profile.changeUsername(displayUsername.text) - displayUsername.isUsernameEditingAllowed = false + profile.changeUsername(displayUsername.text); + displayUsername.isUsernameEditingAllowed = false; } else { - displayUsername.isUsernameEditingAllowed = true - displayUsername.focus = true - displayUsername.selectAll() + displayUsername.isUsernameEditingAllowed = true; + displayUsername.focus = true; + displayUsername.selectAll(); } } } + } MatrixText { -- cgit 1.5.1 From 2a858d84e22c3813a380d4ff3e838cd0093955a0 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 2 Feb 2021 11:50:57 -0500 Subject: Update format script again --- .ci/format.sh | 3 ++- resources/qml/PrivacyScreen.qml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'resources/qml/PrivacyScreen.qml') diff --git a/.ci/format.sh b/.ci/format.sh index 31eba878..cdbc0464 100755 --- a/.ci/format.sh +++ b/.ci/format.sh @@ -14,7 +14,8 @@ do clang-format -i "$f" done; -QMLFORMAT_PATH=$(command -v qmlformat) +QMLFORMAT_PATH=$(command -v qmlformat || true) + if [ -n "$QMLFORMAT_PATH" ]; then QML_FILES=$(find resources -type f -iname "*.qml") diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index 98c802a0..2cfae471 100644 --- a/resources/qml/PrivacyScreen.qml +++ b/resources/qml/PrivacyScreen.qml @@ -33,9 +33,9 @@ Item { onTriggered: { if (MainWindow.visible) timelineRoot.grabToImage(function(result) { - screenSaver.state = "Visible"; - imageSource = result.url; - }, Qt.size(width, height)); + screenSaver.state = "Visible"; + imageSource = result.url; + }, Qt.size(width, height)); } } -- cgit 1.5.1 From 3433cc3be7d0e9038017f3d1e2ecd53e830b6073 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 3 Feb 2021 03:12:08 +0100 Subject: Cleanup privacy screen, no more grabImage --- resources/qml/MessageInput.qml | 1 + resources/qml/PrivacyScreen.qml | 33 ++++----------------------------- resources/qml/TimelineView.qml | 14 ++++++++------ 3 files changed, 13 insertions(+), 35 deletions(-) (limited to 'resources/qml/PrivacyScreen.qml') diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml index 4c73f28b..5d335872 100644 --- a/resources/qml/MessageInput.qml +++ b/resources/qml/MessageInput.qml @@ -273,6 +273,7 @@ Rectangle { cursorShape: Qt.IBeamCursor onClicked: TimelineManager.timeline.input.paste(true) } + } ScrollBar.vertical: ScrollBar { diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index 2cfae471..76520706 100644 --- a/resources/qml/PrivacyScreen.qml +++ b/resources/qml/PrivacyScreen.qml @@ -6,11 +6,8 @@ Item { id: privacyScreen property var timelineRoot - property var imageSource: "" property int screenTimeout - anchors.fill: parent - Connections { target: TimelineManager onFocusChanged: { @@ -31,22 +28,16 @@ Item { interval: screenTimeout * 1000 running: true onTriggered: { - if (MainWindow.visible) - timelineRoot.grabToImage(function(result) { - screenSaver.state = "Visible"; - imageSource = result.url; - }, Qt.size(width, height)); - + screenSaver.state = "Visible"; } } - Rectangle { + Item { id: screenSaver state: "Invisible" anchors.fill: parent visible: false - color: "transparent" states: [ State { name: "Visible" @@ -122,27 +113,11 @@ Item { } ] - Image { - id: image - - cache: false - anchors.fill: parent - source: imageSource - } - - ShaderEffectSource { - id: effectSource - - sourceItem: image - anchors.fill: image - sourceRect: Qt.rect(0, 0, width, height) - } - FastBlur { id: blur - anchors.fill: effectSource - source: effectSource + anchors.fill: parent + source: timelineRoot radius: 50 } diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 9fa2139e..c03e8d31 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -277,19 +277,21 @@ Page { MessageInput { } + } NhekoDropArea { - anchors.fill: timelineLayout + anchors.fill: parent roomid: TimelineManager.timeline ? TimelineManager.timeline.roomId() : "" } - PrivacyScreen { - visible: Settings.privacyScreen - screenTimeout: Settings.privacyScreenTimeout - timelineRoot: timelineRoot - } + } + PrivacyScreen { + anchors.fill: parent + visible: Settings.privacyScreen + screenTimeout: Settings.privacyScreenTimeout + timelineRoot: timelineLayout } systemInactive: SystemPalette { -- cgit 1.5.1