status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-17 00:56:39 +00:00
Code Issues Projects Releases Wiki Activity

fix(@desktop/chat): ensure edit message input uses correct theme color

Browse Source 
Fixes #2978
This commit is contained in:
Pascal Precht 2021-07-28 13:08:32 +02:00 committed by Iuri Matias
parent 08e3b330e5
commit 49a522e889
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ

@ -1 +1 @@
Subproject commit d327c515213b4d3f9de7d408803d7d2a4a2b0575 Subproject commit f0a867e1f35c8f712e6c9cc9da3f78e6bb2bb514

6
ui/shared/status/StatusChatInput.qml
View File

@ -11,6 +11,8 @@ import "../../app/AppLayouts/Chat/ChatColumn"
import "./emojiList.js" as EmojiJSON import "./emojiList.js" as EmojiJSON
import StatusQ.Core.Theme 0.1
Rectangle { Rectangle {
id: control id: control
signal sendTransactionCommandButtonClicked() signal sendTransactionCommandButtonClicked()
@ -737,7 +739,7 @@ Rectangle {
return messageInputField.implicitHeight return messageInputField.implicitHeight
} }
color: isEdit ? Style.current.secondaryInputBackground : Style.current.inputBackground color: isEdit ? Theme.palette.statusChatInput.secondaryBackgroundColor : Style.current.inputBackground
radius: control.isStatusUpdateInput ? 36 : radius: control.isStatusUpdateInput ? 36 :
height > defaultInputFieldHeight + 1 || extendedArea.visible ? 16 : 32 height > defaultInputFieldHeight + 1 || extendedArea.visible ? 16 : 32
@ -861,7 +863,7 @@ Rectangle {
placeholderText: qsTrId("type-a-message") placeholderText: qsTrId("type-a-message")
placeholderTextColor: Style.current.secondaryText placeholderTextColor: Style.current.secondaryText
selectByMouse: true 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 topPadding: control.isStatusUpdateInput ? 18 : Style.current.smallPadding
bottomPadding: control.isStatusUpdateInput ? 14 : 12 bottomPadding: control.isStatusUpdateInput ? 14 : 12
Keys.onPressed: onKeyPress(event) Keys.onPressed: onKeyPress(event)