Add space, so content isn't bellow scrollbar

CURA-8979
This commit is contained in:
j.delarago 2022-03-15 15:54:50 +01:00
parent 99f9918db5
commit b33a5d7b84

View File

@ -110,6 +110,7 @@ Item
ScrollBar.vertical: UM.ScrollBar ScrollBar.vertical: UM.ScrollBar
{ {
id: scrollBar
parent: informationPage parent: informationPage
anchors anchors
{ {
@ -122,7 +123,7 @@ Item
clip: true clip: true
visible: pageSelectorTabRow.currentItem.activeView === "information" 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 property real rowHeight: UM.Theme.getSize("setting_control").height
Column Column
@ -169,10 +170,10 @@ Item
} }
Cura.TextField Cura.TextField
{ {
id: displayNameTextField; id: displayNameTextField
width: informationPage.columnWidth; width: informationPage.columnWidth
text: properties.name; text: properties.name
enabled: base.editingEnabled; enabled: base.editingEnabled
onEditingFinished: base.updateMaterialDisplayName(properties.name, text) onEditingFinished: base.updateMaterialDisplayName(properties.name, text)
} }
} }
@ -480,7 +481,7 @@ Item
Cura.ReadOnlyTextArea Cura.ReadOnlyTextArea
{ {
text: properties.description text: properties.description
width: informationPage.width width: informationPage.width - scrollBar.width
height: 0.4 * informationPage.width height: 0.4 * informationPage.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
@ -499,7 +500,7 @@ Item
Cura.ReadOnlyTextArea Cura.ReadOnlyTextArea
{ {
text: properties.adhesion_info text: properties.adhesion_info
width: informationPage.width width: informationPage.width - scrollBar.width
height: 0.4 * informationPage.width height: 0.4 * informationPage.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
readOnly: !base.editingEnabled readOnly: !base.editingEnabled