Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-05 18:19:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1196 from Armored-Dragon/fix/AC_fix_quickchat_colortheme
Some checks failed
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Has been cancelled
Details
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Has been cancelled
Details

Browse source 
Fix ArmoredChat quick_message qml dialog colors on light theme systems
This commit is contained in:
ksuprynowicz 2024-10-27 13:12:14 +01:00 committed by GitHub
commit 8b4207d18c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/communityScripts/armored-chat/armored_chat.qml
View file

@ -205,6 +205,8 @@ Rectangle {
height: parent.height
placeholderText: pageVal.charAt(0).toUpperCase() + pageVal.slice(1) + " chat message..."
clip: false
font.italic: text == ""
Keys.onPressed: {
if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && !(event.modifiers & Qt.ShiftModifier)) {
event.accepted = true;

36
scripts/communityScripts/armored-chat/armored_chat_quick_message.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
Rectangle {
Item {
id: root
property var window
@ -21,15 +21,22 @@ Rectangle {
z: 99
visible: false
TextArea {
id: textArea
x: 0
Rectangle {
width: parent.width
height: parent.height
text:""
textColor: "#ffffff"
color: Qt.rgba(0.95,0.95,0.95,1)
}
TextInput {
id: textArea
x: 5
width: parent.width
height: parent.height
text: ""
color: "#000"
clip: false
font.pointSize: 18
verticalAlignment: Text.AlignVCenter
Keys.onReturnPressed: { _onEnterPressed(); }
Keys.onEnterPressed: { _onEnterPressed(); }
@ -52,33 +59,36 @@ Rectangle {
text: "Local message..."
font.pointSize: 16
color: "gray"
x: 0
x: 5
width: parent.width
anchors.verticalCenter: parent.verticalCenter
visible: textArea.text == ""
font.italic: true
}
Button {
Rectangle {
id: button
x: parent.width - width
y: 0
width: 64
height: parent.height
clip: false
visible: true
color: "#262626"
Image {
id: image
width: 30
height: 30
fillMode: Image.PreserveAspectFit
visible: true
anchors.centerIn: parent
source: "./img/ui/send_white.png"
}
onClicked: {
_onEnterPressed();
MouseArea {
anchors.fill: parent
onClicked: {
_onEnterPressed();
}
}
}