From 7ae58badd9a2e009db5aafbaa23aa251873147ee Mon Sep 17 00:00:00 2001
From: Sebastian Wolf <sebastian@ygriega.de>
Date: Tue, 16 Feb 2021 21:36:29 +0100
Subject: [PATCH] Fix highlighted behavior after options drawer was opened

---
 qml/components/MessageListViewItem.qml | 7 ++++---
 rpm/harbour-fernschreiber.spec         | 2 +-
 rpm/harbour-fernschreiber.yaml         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/qml/components/MessageListViewItem.qml b/qml/components/MessageListViewItem.qml
index 61c7cb4..5a8ea23 100644
--- a/qml/components/MessageListViewItem.qml
+++ b/qml/components/MessageListViewItem.qml
@@ -43,8 +43,9 @@ ListItem {
     });
     readonly property bool isOwnMessage: page.myUserId === myMessage.sender.user_id
     property bool hasContentComponent
+    property bool additionalOptionsOpened
 
-    highlighted: (down || isSelected) && !menuOpen
+    highlighted: (down || isSelected || additionalOptionsOpened) && !menuOpen
     openMenuOnPressAndHold: !messageListItem.precalculatedValues.pageIsSelecting
 
     signal replyToMessage()
@@ -81,7 +82,7 @@ ListItem {
     Connections {
         target: messageOptionsDrawer
         onCloseRequested: {
-            messageListItem.highlighted = false;
+            messageListItem.additionalOptionsOpened = false;
         }
     }
 
@@ -119,7 +120,7 @@ ListItem {
                         messageOptionsDrawer.userInformation = userInformation;
                         messageOptionsDrawer.sourceItem = messageListItem
                         messageOptionsDrawer.additionalItemsModel = (extraContentLoader.item && ("extraContextMenuItems" in extraContentLoader.item)) ? extraContentLoader.item.extraContextMenuItems : 0;
-                        messageListItem.highlighted = true;
+                        messageListItem.additionalOptionsOpened = true;
                         messageOptionsDrawer.open = true;
                     }
                     text: qsTr("More Options...")
diff --git a/rpm/harbour-fernschreiber.spec b/rpm/harbour-fernschreiber.spec
index 0d7c696..97dd7bf 100644
--- a/rpm/harbour-fernschreiber.spec
+++ b/rpm/harbour-fernschreiber.spec
@@ -12,7 +12,7 @@ Name:       harbour-fernschreiber
 
 Summary:    Fernschreiber is a Telegram client for Sailfish OS
 Version:    0.7.1
-Release:    4
+Release:    5
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://werkwolf.eu/
diff --git a/rpm/harbour-fernschreiber.yaml b/rpm/harbour-fernschreiber.yaml
index 478fe32..5994827 100644
--- a/rpm/harbour-fernschreiber.yaml
+++ b/rpm/harbour-fernschreiber.yaml
@@ -1,7 +1,7 @@
 Name: harbour-fernschreiber
 Summary: Fernschreiber is a Telegram client for Sailfish OS
 Version: 0.7.1
-Release: 4
+Release: 5
 # The contents of the Group field should be one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group: Qt/Qt