GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Ghostkeeper 2016-08-22 15:17:31 +02:00
commit f91c101b85
2 changed files with 94 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -154,11 +154,17 @@ Item {
Column
{
spacing: UM.Theme.getSize("default_lining").height
Repeater
// This is to ensure that the panel is first increasing in size up to 200 and then shows a scrollbar.
// It kinda looks ugly otherwise (big panel, no content on it)
height: contents.count * UM.Theme.getSize("section").height < 200 ? contents.count * UM.Theme.getSize("section").height : 200
ScrollView
{
height: parent.height
width: UM.Theme.getSize("setting").width
style: UM.Theme.styles.scrollview
ListView
{
id: contents
height: childrenRect.height;
model: UM.SettingDefinitionsModel
{
@ -259,6 +265,7 @@ Item {
}
}
}
}
Button
{