From 6a9af0e040d8c04753ba0ef0723b124727a8aa4d Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 17 Oct 2016 10:04:16 +0200
Subject: [PATCH] fix(DroppableTextArea): fix style and add `clip=true` on
 Flickable

---
 tests/ui/modules/Common/DroppableTextArea.qml       | 8 ++++++++
 tests/ui/modules/Linphone/Contact/PresenceLevel.qml | 2 +-
 tests/ui/views/MainWindow/Conversation.qml          | 8 ++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/ui/modules/Common/DroppableTextArea.qml b/tests/ui/modules/Common/DroppableTextArea.qml
index c452b5399..0bffb1c11 100644
--- a/tests/ui/modules/Common/DroppableTextArea.qml
+++ b/tests/ui/modules/Common/DroppableTextArea.qml
@@ -36,12 +36,20 @@ Item {
     TextArea.flickable: TextArea {
       id: textArea
 
+      background: Rectangle {
+        color: '#FFFFFF'
+        border.color: '#D0D8DE'
+      }
+
       rightPadding: fileChooserButton.width +
         fileChooserButton.anchors.rightMargin +
         DroppableTextAreaStyle.fileChooserButton.margins
       wrapMode: TextArea.Wrap
     }
     anchors.fill: parent
+
+    // Necessary, else `placeHolderText` can get out of the component.
+    clip: true
   }
 
   // Handle click to select files.
diff --git a/tests/ui/modules/Linphone/Contact/PresenceLevel.qml b/tests/ui/modules/Linphone/Contact/PresenceLevel.qml
index 31988b7e2..2e2e3c35f 100644
--- a/tests/ui/modules/Linphone/Contact/PresenceLevel.qml
+++ b/tests/ui/modules/Linphone/Contact/PresenceLevel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.7
 
 import Common 1.0
-import Linphone 1.0 /* It contains `Presence`. */
+import Linphone 1.0
 
 // ===================================================================
 
diff --git a/tests/ui/views/MainWindow/Conversation.qml b/tests/ui/views/MainWindow/Conversation.qml
index e2c479f86..22e3b1208 100644
--- a/tests/ui/views/MainWindow/Conversation.qml
+++ b/tests/ui/views/MainWindow/Conversation.qml
@@ -120,14 +120,14 @@ ColumnLayout  {
     }
   }
 
-  Borders {
+  Rectangle {
     Layout.fillWidth: true
-    Layout.preferredHeight: 70
-    borderColor: '#C7C7C7'
-    leftWidth: 1
+    Layout.preferredHeight: 80
+    color: '#E2E9EF'
 
     DroppableTextArea {
       anchors.fill: parent
+      anchors.margins: 10
       placeholderText: qsTr('newMessagePlaceholder')
     }
   }