From 49a522e8893c0f441898d630932f8adc5eab3874 Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Wed, 28 Jul 2021 13:08:32 +0200 Subject: [PATCH] fix(@desktop/chat): ensure edit message input uses correct theme color Fixes #2978 --- ui/StatusQ | 2 +- ui/shared/status/StatusChatInput.qml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/StatusQ b/ui/StatusQ index d327c51521..f0a867e1f3 160000 --- a/ui/StatusQ +++ b/ui/StatusQ @@ -1 +1 @@ -Subproject commit d327c515213b4d3f9de7d408803d7d2a4a2b0575 +Subproject commit f0a867e1f35c8f712e6c9cc9da3f78e6bb2bb514 diff --git a/ui/shared/status/StatusChatInput.qml b/ui/shared/status/StatusChatInput.qml index c023013bc6..5f1f6b0de8 100644 --- a/ui/shared/status/StatusChatInput.qml +++ b/ui/shared/status/StatusChatInput.qml @@ -11,6 +11,8 @@ import "../../app/AppLayouts/Chat/ChatColumn" import "./emojiList.js" as EmojiJSON +import StatusQ.Core.Theme 0.1 + Rectangle { id: control signal sendTransactionCommandButtonClicked() @@ -737,7 +739,7 @@ Rectangle { return messageInputField.implicitHeight } - color: isEdit ? Style.current.secondaryInputBackground : Style.current.inputBackground + color: isEdit ? Theme.palette.statusChatInput.secondaryBackgroundColor : Style.current.inputBackground radius: control.isStatusUpdateInput ? 36 : height > defaultInputFieldHeight + 1 || extendedArea.visible ? 16 : 32 @@ -861,7 +863,7 @@ Rectangle { placeholderText: qsTrId("type-a-message") placeholderTextColor: Style.current.secondaryText selectByMouse: true - color: isEdit ? Style.current.secondaryInputText : Style.current.textColor + color: isEdit ? Theme.palette.directColor1 : Style.current.textColor topPadding: control.isStatusUpdateInput ? 18 : Style.current.smallPadding bottomPadding: control.isStatusUpdateInput ? 14 : 12 Keys.onPressed: onKeyPress(event)