3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '3.3'

Browse source
This commit is contained in:
Ghostkeeper 2018-04-13 16:14:23 +02:00
commit 133f6f43fe
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
18 changed files with 74 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/SidebarSimple.qml
View file

@ -247,17 +247,19 @@ Item
{
function showTooltip (showTooltip)
{
if (showTooltip) {
if (showTooltip)
{
var content = catalog.i18nc("@tooltip", "This quality profile is not available for you current material and nozzle configuration. Please change these to enable this quality profile")
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, customisedSettings.height), content)
}
else {
else
{
base.hideTooltip()
}
}
id: unavailableLineToolTip
height: 20 // hovered area height
height: 20 * screenScaleFactor // hovered area height
z: parent.z + 1 // should be higher, otherwise the area can be hovered
x: 0
anchors.verticalCenter: qualitySlider.verticalCenter
@ -267,7 +269,8 @@ Item
id: leftArea
width:
{
if (qualityModel.availableTotalTicks == 0) {
if (qualityModel.availableTotalTicks == 0)
{
return qualityModel.qualitySliderStepWidth * qualityModel.totalTicks
}
return qualityModel.qualitySliderStepWidth * qualityModel.qualitySliderAvailableMin - 10