From f1aa4173dfe097026d85ae6b1d6ea10daeaf0904 Mon Sep 17 00:00:00 2001
From: mjoseph <matheo.joseph@savoirfairelinux.com>
Date: Tue, 23 May 2023 09:51:13 -0400
Subject: [PATCH] searchbar: Changed underline color in tab message result
Changed the color with the color of the current conversation
GitLab: #1083
Change-Id: I8cb8ef343a99a0929ab65c8593515d306e468333
---
src/app/mainview/components/FilterTabButton.qml | 6 ++++--
src/app/mainview/components/MessagesResearchPanel.qml | 5 +++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/app/mainview/components/FilterTabButton.qml b/src/app/mainview/components/FilterTabButton.qml
index af812e31f..7e642bcaa 100644
--- a/src/app/mainview/components/FilterTabButton.qml
+++ b/src/app/mainview/components/FilterTabButton.qml
@@ -33,6 +33,8 @@ TabButton {
property var hoverColor: JamiTheme.backgroundColor
property var textColor: JamiTheme.textColor
property var textColorHovered: JamiTheme.textColorHovered
+ property var underlineColor: textColor
+ property var underlineColorHovered: textColorHovered
property var borderWidth: 2
property var bottomMargin: 1
property var underlineContentOnly: false
@@ -85,10 +87,10 @@ TabButton {
height: borderWidth
color: {
if (!root.down && root.hovered)
- return root.textColorHovered;
+ return underlineColorHovered;
if (!root.down)
return "transparent";
- return root.textColor;
+ return root.underlineColor;
}
}
diff --git a/src/app/mainview/components/MessagesResearchPanel.qml b/src/app/mainview/components/MessagesResearchPanel.qml
index f98cf722a..014c88bf2 100644
--- a/src/app/mainview/components/MessagesResearchPanel.qml
+++ b/src/app/mainview/components/MessagesResearchPanel.qml
@@ -59,6 +59,8 @@ Rectangle {
bottomMargin: JamiTheme.settingsMarginSize
fontSize: JamiTheme.menuFontSize
underlineContentOnly: true
+ underlineColor: CurrentConversation.color
+ underlineColorHovered: CurrentConversation.color
down: researchTabBar.currentIndex === 0
labelText: JamiStrings.messages
@@ -73,6 +75,9 @@ Rectangle {
bottomMargin: JamiTheme.settingsMarginSize
fontSize: JamiTheme.menuFontSize
underlineContentOnly: true
+ underlineColor: CurrentConversation.color
+ underlineColorHovered: CurrentConversation.color
+
down: researchTabBar.currentIndex === 1
labelText: JamiStrings.files
--
GitLab