3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 07:41:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

Browse source 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
	resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.
This commit is contained in:
Ghostkeeper 2018-11-26 13:43:20 +01:00
commit 826044da7e
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
57 changed files with 1404 additions and 539 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/qml/ExpandableComponent.qml
View file

@ -42,6 +42,12 @@ Item
property alias expandedHighlightColor: expandedHighlight.color
// What should the radius of the header be. This is also influenced by the headerCornerSide
property alias headerRadius: background.radius
// On what side should the header corners be shown? 1 is down, 2 is left, 3 is up and 4 is right.
property alias headerCornerSide: background.cornerSide
function togglePopup()
{
if(popup.visible)
@ -73,7 +79,8 @@ Item
implicitHeight: 100 * screenScaleFactor
implicitWidth: 400 * screenScaleFactor
Rectangle
RoundedRectangle
{
id: background
property real padding: UM.Theme.getSize("default_margin").width