Merge pull request #506 from Nheko-Reborn/timeline-buttons

Use overlay buttons for message actions

1 files changed, 7 insertions, 23 deletions

diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml
index ebb9031a..58805f48 100644
--- a/resources/qml/EncryptionIndicator.qml
+++ b/resources/qml/EncryptionIndicator.qml
@@ -6,40 +6,24 @@ import QtQuick 2.12
 import QtQuick.Controls 2.1
 import im.nheko 1.0
 
-Rectangle {
-    id: indicator
+Image {
+    id: stateImg
 
     property bool encrypted: false
 
-    function getEncryptionImage() {
+    width: 16
+    height: 16
+    source: {
         if (encrypted)
             return "image://colorimage/:/icons/icons/ui/lock.png?" + colors.buttonText;
         else
             return "image://colorimage/:/icons/icons/ui/unlock.png?#dd3d3d";
     }
-
-    function getEncryptionTooltip() {
-        if (encrypted)
-            return qsTr("Encrypted");
-        else
-            return qsTr("This message is not encrypted!");
-    }
-
-    color: "transparent"
-    width: 16
-    height: 16
-    ToolTip.visible: ma.hovered && indicator.visible
-    ToolTip.text: getEncryptionTooltip()
+    ToolTip.visible: ma.hovered
+    ToolTip.text: encrypted ? qsTr("Encrypted") : qsTr("This message is not encrypted!")
 
     HoverHandler {
         id: ma
     }
 
-    Image {
-        id: stateImg
-
-        anchors.fill: parent
-        source: getEncryptionImage()
-    }
-
 }