GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 09:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu

Browse Source
This commit is contained in:
Jaime van Kessel 2018-11-16 14:58:47 +01:00
commit 320efa443e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/PreviewStage/PreviewMenu.qml
View File

@ -60,7 +60,7 @@ Item
}
}
// Nothing was active, so just return the first one (the list is sorted by priority, so the most
// important one sshould be returned)
// important one should be returned)
return viewModel.getItem(0)
}

2
resources/qml/IconWithText.qml
View File

@ -10,7 +10,7 @@ import Cura 1.0 as Cura
// Reusable component that holds an (re-colorable) icon on the left with some text on the right.
// This component is also designed to be used with layouts. It will use the width of the text + icon as preferred width
// It sets the icon size + half of the content as it's minium width (in which case it will elide the text)
// It sets the icon size + half of the content as its minium width (in which case it will elide the text)
Item
{
property alias iconColor: icon.color