chat and contact dialogs to honor emoji_enabled setting

d99kris · Jan 5, 2025 · 3de1246 · 3de1246
1 parent c0f48b0
commit 3de1246
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/lib/common/src/version.h b/lib/common/src/version.h
@@ -7,4 +7,4 @@
 
 #pragma once
 
-#define NCHAT_VERSION "5.5.4"
+#define NCHAT_VERSION "5.5.5"
diff --git a/src/nchat.1 b/src/nchat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH NCHAT "1" "January 2025" "nchat 5.5.4" "User Commands"
+.TH NCHAT "1" "January 2025" "nchat 5.5.5" "User Commands"
 .SH NAME
 nchat \- ncurses chat
 .SH SYNOPSIS

diff --git a/src/uichatlistdialog.cpp b/src/uichatlistdialog.cpp
@@ -1,6 +1,6 @@
 // uichatlistdialog.cpp
 //
-// Copyright (c) 2024 Kristofer Berggren
+// Copyright (c) 2024-2025 Kristofer Berggren
 // All rights reserved.
 //
 // nchat is distributed under the MIT license, see LICENSE for details.
@@ -51,6 +51,8 @@ bool UiChatListDialog::OnTimer()
 
 void UiChatListDialog::UpdateList()
 {
+  const bool emojiEnabled = m_Model->GetEmojiEnabled();
+
   m_Index = 0;
   m_Items.clear();
   m_ChatListItemVec.clear();
@@ -73,6 +75,11 @@ void UiChatListDialog::UpdateList()
       std::string displayName = name +
         (isMultipleProfiles ? " @ " + m_Model->GetProfileDisplayName(profileId) : "");
 
+      if (!emojiEnabled)
+      {
+        displayName = StrUtil::Textize(displayName);
+      }
+
       static const bool developerMode = AppUtil::GetDeveloperMode();
       if (developerMode)
       {

diff --git a/src/uicontactlistdialog.cpp b/src/uicontactlistdialog.cpp
@@ -1,6 +1,6 @@
 // uicontactlistdialog.cpp
 //
-// Copyright (c) 2019-2024 Kristofer Berggren
+// Copyright (c) 2019-2025 Kristofer Berggren
 // All rights reserved.
 //
 // nchat is distributed under the MIT license, see LICENSE for details.
@@ -70,6 +70,8 @@ void UiContactListDialog::UpdateList()
     m_DialogContactInfos = m_Model->GetContactInfos();
   }
 
+  const bool emojiEnabled = m_Model->GetEmojiEnabled();
+
   m_Index = 0;
   m_Items.clear();
   m_ContactListItemVec.clear();
@@ -94,6 +96,11 @@ void UiContactListDialog::UpdateList()
         std::string displayName = name +
           (isMultipleProfiles ? " @ " + m_Model->GetProfileDisplayName(profileId) : "");
 
+        if (!emojiEnabled)
+        {
+          displayName = StrUtil::Textize(displayName);
+        }
+
         static const bool developerMode = AppUtil::GetDeveloperMode();
         if (developerMode)
         {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@

		#pragma once

		#define NCHAT_VERSION "5.5.4"
		#define NCHAT_VERSION "5.5.5"