From 9ac4cd0a97f76a364908aadfc3ba3d2242b2c531 Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Wed, 16 Sep 2020 06:40:21 -0400
Subject: [PATCH] Separate localEcho & readCounter theme properties

Allows making the hourglass gray by default again, while the read
counter uses the accent color.
---
 CHANGELOG.md                                 |  4 ++--
 src/gui/Pages/Chat/Timeline/EventContent.qml | 12 ++++++++----
 src/themes/Glass.qpl                         |  3 ++-
 src/themes/Midnight.qpl                      |  3 ++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 708226b4..5e8ca93f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,8 +25,8 @@ and this project adheres to
   have this event as their last seen one in the room.  
   A way to see who read the message and when will be added in the future.
 
-- Themes: add a `chat.message.serverState` property, controls the color of
-  the local echo hourglass and read marker indicator.
+- Themes: add `chat.message.localEcho` and `chat.message.readCounter` color
+  properties
 
 - Add a `zoom` setting, defaults to `1.0`
 
diff --git a/src/gui/Pages/Chat/Timeline/EventContent.qml b/src/gui/Pages/Chat/Timeline/EventContent.qml
index 28ab4c20..876aa6be 100644
--- a/src/gui/Pages/Chat/Timeline/EventContent.qml
+++ b/src/gui/Pages/Chat/Timeline/EventContent.qml
@@ -36,10 +36,14 @@ HRowLayout {
     readonly property string timeText: utils.formatTime(model.date, false)
 
     readonly property string stateText:
-        `<font size=${theme.fontSize.small}px ` +
-              `color=${theme.chat.message.serverState}>` + (
-            model.is_local_echo ? `&nbsp;⏳` :
-            model.read_by_count ? `&nbsp;⦿&nbsp;${model.read_by_count}` :
+        `<font size=${theme.fontSize.small}px color=` + (
+            model.is_local_echo ?
+            `${theme.chat.message.localEcho}>&nbsp;⧗</font>` :  // U+29D7
+
+            model.read_by_count ?
+            `${theme.chat.message.readCounter}>&nbsp;⦿&nbsp;` +
+            model.read_by_count :  // U+29BF
+
             ""
         ) + "</font>"
 
diff --git a/src/themes/Glass.qpl b/src/themes/Glass.qpl
index b2f37236..7356ccd6 100644
--- a/src/themes/Glass.qpl
+++ b/src/themes/Glass.qpl
@@ -415,7 +415,8 @@ chat:
 
         color body:        colors.text
         color date:        colors.dimText
-        color serverState: colors.accentText
+        color localEcho:   colors.dimText
+        color readCounter: colors.accentText
 
         color redactedBody: colors.dimText
 
diff --git a/src/themes/Midnight.qpl b/src/themes/Midnight.qpl
index 95215cf6..d30f9ba5 100644
--- a/src/themes/Midnight.qpl
+++ b/src/themes/Midnight.qpl
@@ -424,7 +424,8 @@ chat:
 
         color body:        colors.text
         color date:        colors.dimText
-        color serverState: colors.accentText
+        color localEcho:   colors.dimText
+        color readCounter: colors.accentText
 
         color redactedBody: colors.dimText