Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorj.delarago <joeydelarago@gmail.com>2022-03-15 17:54:50 +0300
committerj.delarago <joeydelarago@gmail.com>2022-03-15 17:54:50 +0300
commitb33a5d7b8464a6a033e6a2894f156dba21371c2c (patch)
treeba8dc21b368a1cd89d1a9a89a706dd077fb2c0b4
parent99f9918db506044e98b419d8d8d0fd0f4d49b3a1 (diff)
Add space, so content isn't bellow scrollbar
CURA-8979
-rw-r--r--resources/qml/Preferences/Materials/MaterialsView.qml15
1 files changed, 8 insertions, 7 deletions
diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml
index 4c15e04972..a579a36a8d 100644
--- a/resources/qml/Preferences/Materials/MaterialsView.qml
+++ b/resources/qml/Preferences/Materials/MaterialsView.qml
@@ -110,6 +110,7 @@ Item
ScrollBar.vertical: UM.ScrollBar
{
+ id: scrollBar
parent: informationPage
anchors
{
@@ -122,7 +123,7 @@ Item
clip: true
visible: pageSelectorTabRow.currentItem.activeView === "information"
- property real columnWidth: Math.floor(width / 2 - UM.Theme.getSize("narrow_margin").width)
+ property real columnWidth: Math.floor((width - scrollBar.width - UM.Theme.getSize("narrow_margin").width) / 2)
property real rowHeight: UM.Theme.getSize("setting_control").height
Column
@@ -169,10 +170,10 @@ Item
}
Cura.TextField
{
- id: displayNameTextField;
- width: informationPage.columnWidth;
- text: properties.name;
- enabled: base.editingEnabled;
+ id: displayNameTextField
+ width: informationPage.columnWidth
+ text: properties.name
+ enabled: base.editingEnabled
onEditingFinished: base.updateMaterialDisplayName(properties.name, text)
}
}
@@ -480,7 +481,7 @@ Item
Cura.ReadOnlyTextArea
{
text: properties.description
- width: informationPage.width
+ width: informationPage.width - scrollBar.width
height: 0.4 * informationPage.width
wrapMode: Text.WordWrap
@@ -499,7 +500,7 @@ Item
Cura.ReadOnlyTextArea
{
text: properties.adhesion_info
- width: informationPage.width
+ width: informationPage.width - scrollBar.width
height: 0.4 * informationPage.width
wrapMode: Text.WordWrap
readOnly: !base.editingEnabled