Merge pull request #1196 from Armored-Dragon/fix/AC_fix_quickchat_col…

…ortheme Fix ArmoredChat quick_message qml dialog colors on light theme systems
overte-org · Oct 27, 2024 · 8b4207d · 8b4207d
2 parents e7603a0 + d3bf9a5
commit 8b4207d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/scripts/communityScripts/armored-chat/armored_chat.qml b/scripts/communityScripts/armored-chat/armored_chat.qml
@@ -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;

diff --git a/scripts/communityScripts/armored-chat/armored_chat_quick_message.qml b/scripts/communityScripts/armored-chat/armored_chat_quick_message.qml
@@ -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 {
+        Rectangle {
+            width: parent.width
+            height: parent.height
+            color: Qt.rgba(0.95,0.95,0.95,1)
+        }
+
+        TextInput {
             id: textArea
-            x: 0
+            x: 5
             width: parent.width
             height: parent.height
-            text:""
-            textColor: "#ffffff"
+            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();
+                }
             }
         }