From 4bd3088b587591a08d9c4c5e54959c5fd04ca9d2 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Wed, 10 Apr 2019 09:48:51 +0200
Subject: [PATCH 1/2] Fix ScrollableTextArea

CURA-6447
---
 resources/qml/Widgets/ScrollableTextArea.qml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/qml/Widgets/ScrollableTextArea.qml b/resources/qml/Widgets/ScrollableTextArea.qml
index 065d5e60df..249eca5bd6 100644
--- a/resources/qml/Widgets/ScrollableTextArea.qml
+++ b/resources/qml/Widgets/ScrollableTextArea.qml
@@ -15,6 +15,14 @@ ScrollView
 {
     property alias textArea: _textArea
 
+    clip: true
+
+    background: Rectangle  // Border
+    {
+        border.color: UM.Theme.getColor("lining")
+        border.width: UM.Theme.getSize("default_lining").width
+    }
+
     TextArea
     {
         id: _textArea
@@ -22,11 +30,5 @@ ScrollView
         textFormat: TextEdit.PlainText
         renderType: Text.NativeRendering
         selectByMouse: true
-
-        background: Rectangle  // Border
-        {
-            border.color: UM.Theme.getColor("lining")
-            border.width: UM.Theme.getSize("default_lining").width
-        }
     }
 }

From 70e97304d17a1d4fc04c7cbaa0825ae1308d299f Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Wed, 10 Apr 2019 10:33:09 +0200
Subject: [PATCH 2/2] Fix add-by-ip page layout

CURA-6057
---
 .../qml/WelcomePages/AddPrinterByIpContent.qml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml
index 2930bc8dbe..9376909070 100644
--- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml
+++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml
@@ -48,17 +48,19 @@ Item
 
         Item
         {
-            width: parent.width
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.margins: UM.Theme.getSize("default_margin").width
 
             Label
             {
                 id: explainLabel
                 height: contentHeight
-                width: parent.width
+                anchors.left: parent.left
+                anchors.right: parent.right
                 anchors.top: parent.top
-                anchors.margins: UM.Theme.getSize("default_margin").width
-                font: UM.Theme.getFont("default")
 
+                font: UM.Theme.getFont("default")
                 text: catalog.i18nc("@label", "Enter the IP address or hostname of your printer on the network.")
             }
 
@@ -66,8 +68,10 @@ Item
             {
                 id: userInputFields
                 height: childrenRect.height
-                width: parent.width
+                anchors.left: parent.left
+                anchors.right: parent.right
                 anchors.top: explainLabel.bottom
+                anchors.topMargin: UM.Theme.getSize("default_margin").width
 
                 Cura.TextField
                 {
@@ -76,7 +80,6 @@ Item
                     height: addPrinterButton.height
                     anchors.verticalCenter: addPrinterButton.verticalCenter
                     anchors.left: parent.left
-                    anchors.margins: UM.Theme.getSize("default_margin").width
 
                     validator: RegExpValidator
                     {
@@ -92,8 +95,7 @@ Item
                     id: addPrinterButton
                     anchors.top: parent.top
                     anchors.left: hostnameField.right
-                    anchors.margins: UM.Theme.getSize("default_margin").width
-
+                    anchors.leftMargin: UM.Theme.getSize("default_margin").width
                     text: catalog.i18nc("@button", "Add")
                     onClicked:
                     {