mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-07 15:07:28 -06:00
Tweak layout of Per Object Settings
CURA-1799
This commit is contained in:
parent
ca2daae6ab
commit
2c61fe3249
2 changed files with 10350 additions and 85 deletions
|
@ -147,6 +147,10 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Column
|
||||||
|
{
|
||||||
|
spacing: UM.Theme.getSize("default_lining").height
|
||||||
|
|
||||||
Repeater
|
Repeater
|
||||||
{
|
{
|
||||||
id: contents
|
id: contents
|
||||||
|
@ -169,8 +173,8 @@ Item {
|
||||||
Loader
|
Loader
|
||||||
{
|
{
|
||||||
id: settingLoader
|
id: settingLoader
|
||||||
width: UM.Theme.getSize("setting").width;
|
width: UM.Theme.getSize("setting").width
|
||||||
height: UM.Theme.getSize("section").height;
|
height: UM.Theme.getSize("section").height
|
||||||
|
|
||||||
property var definition: model
|
property var definition: model
|
||||||
property var settingDefinitionsModel: addedSettingsModel
|
property var settingDefinitionsModel: addedSettingsModel
|
||||||
|
@ -215,7 +219,7 @@ Item {
|
||||||
|
|
||||||
Button
|
Button
|
||||||
{
|
{
|
||||||
width: UM.Theme.getSize("setting").height;
|
width: UM.Theme.getSize("setting").height / 2;
|
||||||
height: UM.Theme.getSize("setting").height;
|
height: UM.Theme.getSize("setting").height;
|
||||||
|
|
||||||
onClicked: addedSettingsModel.setVisible(model.key, false);
|
onClicked: addedSettingsModel.setVisible(model.key, false);
|
||||||
|
@ -227,17 +231,17 @@ Item {
|
||||||
UM.RecolorImage
|
UM.RecolorImage
|
||||||
{
|
{
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
width: parent.width
|
||||||
width: parent.width/2
|
height: parent.height / 2
|
||||||
height: parent.height/2
|
|
||||||
sourceSize.width: width
|
sourceSize.width: width
|
||||||
sourceSize.height: width
|
sourceSize.height: width
|
||||||
color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
|
color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
|
||||||
source: UM.Theme.getIcon("cross1")
|
source: UM.Theme.getIcon("minus")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
UM.SettingPropertyProvider
|
UM.SettingPropertyProvider
|
||||||
{
|
{
|
||||||
id: provider
|
id: provider
|
||||||
|
@ -250,6 +254,7 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Button
|
Button
|
||||||
{
|
{
|
||||||
|
|
10260
resources/themes/cura/icons/minus.svg
Normal file
10260
resources/themes/cura/icons/minus.svg
Normal file
File diff suppressed because it is too large
Load diff
After Width: | Height: | Size: 760 KiB |
Loading…
Add table
Add a link
Reference in a new issue