3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Set contentType to the different expandable components.

Browse source 
Also add a color for the active state when the contentType is 'Fixed'.

Contributes to CURA-5941.
This commit is contained in:
Diego Prado Gesto 2018-12-04 13:53:11 +01:00
parent 4dcce7616b
commit 47ff95b1f3
6 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

@ -16,7 +16,7 @@ Cura.ExpandableComponent
id: base
width: UM.Theme.getSize("layerview_menu_size").width
iconSource: UM.Theme.getIcon("pencil")
contentType: Cura.ExpandableComponent.ContentType.Fixed
Connections
{

16
resources/qml/ExpandableComponent.qml
View file

@ -30,7 +30,7 @@ Item
property alias headerItem: headerItemLoader.sourceComponent
// The contentItem holds the QML item that is shown when the "open" button is pressed
property alias contentItem: content.contentItem
property var contentItem: content.contentItem
// Defines the type of the contents
property int contentType: ExpandableComponent.ContentType.Floating
@ -38,6 +38,7 @@ Item
property color contentBackgroundColor: UM.Theme.getColor("action_button")
property color headerBackgroundColor: UM.Theme.getColor("action_button")
property color headerActiveColor: UM.Theme.getColor("secondary")
property color headerHoverColor: UM.Theme.getColor("action_button_hovered")
// Defines the alignment of the content with respect of the headerItem, by default to the right
@ -123,7 +124,7 @@ Item
width: parent.width
height: UM.Theme.getSize("thick_lining").height
color: UM.Theme.getColor("primary")
visible: expanded
visible: contentType == ExpandableComponent.ContentType.Floating && expanded
anchors.bottom: parent.bottom
}
@ -138,6 +139,9 @@ Item
}
sourceSize.width: width
sourceSize.height: height
source: contentType == ExpandableComponent.ContentType.Floating ?
(expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")) :
UM.Theme.getIcon("pencil")
visible: source != ""
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
@ -151,7 +155,8 @@ Item
onClicked: toggleContent()
hoverEnabled: true
onEntered: background.color = headerHoverColor
onExited: background.color = headerBackgroundColor
onExited: background.color = (contentType == ExpandableComponent.ContentType.Fixed && expanded) ?
headerActiveColor : headerBackgroundColor
}
}
@ -190,8 +195,7 @@ Item
border.color: UM.Theme.getColor("lining")
radius: UM.Theme.getSize("default_radius").width
}
contentItem: Item { }
}
onContentItemChanged:
{
@ -199,7 +203,7 @@ Item
// we need to do it like this.
content.width = contentItem.width + 2 * content.padding
content.height = contentItem.height + 2 * content.padding
}
content.contentItem = contentItem
}
// DO NOT MOVE UP IN THE CODE: This connection has to be here, after the definition of the content item.

1
resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
View file

@ -27,7 +27,6 @@ Cura.ExpandableComponent
name: "cura"
}
iconSource: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
headerItem: Item
{
// Horizontal list that shows the extruders

2
resources/qml/PrintSetupSelector/PrintSetupSelector.qml
View file

@ -14,7 +14,7 @@ Cura.ExpandableComponent
property string enabledText: catalog.i18nc("@label:Should be short", "On")
property string disabledText: catalog.i18nc("@label:Should be short", "Off")
iconSource: UM.Theme.getIcon("pencil")
contentType: Cura.ExpandableComponent.ContentType.Fixed
contentPadding: UM.Theme.getSize("default_lining").width
contentSpacingY: UM.Theme.getSize("narrow_margin").width

1
resources/qml/PrinterSelector/MachineSelector.qml
View file

@ -17,7 +17,6 @@ Cura.ExpandableComponent
contentPadding: UM.Theme.getSize("default_lining").width
contentAlignment: Cura.ExpandableComponent.ContentAlignment.AlignLeft
iconSource: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
UM.I18nCatalog
{

1
resources/qml/ViewsSelector.qml
View file

@ -13,7 +13,6 @@ Cura.ExpandableComponent
contentPadding: UM.Theme.getSize("default_lining").width
contentAlignment: Cura.ExpandableComponent.ContentAlignment.AlignLeft
iconSource: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
property var viewModel: UM.ViewModel { }