mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-11 00:37:50 -06:00
Some tweaks were not really improvements
Contributes to CL-1048
This commit is contained in:
parent
1c8b086403
commit
333cea4e6d
1 changed files with 3 additions and 20 deletions
|
@ -747,7 +747,7 @@ Component
|
||||||
]
|
]
|
||||||
if(inactiveStates.indexOf(state) > -1 && remainingTime > 0)
|
if(inactiveStates.indexOf(state) > -1 && remainingTime > 0)
|
||||||
{
|
{
|
||||||
return UM.Theme.getColor("monitor_background_inactive")
|
return UM.Theme.getColor("monitor_text_inactive")
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -757,7 +757,7 @@ Component
|
||||||
id: progressItem
|
id: progressItem
|
||||||
function getTextOffset()
|
function getTextOffset()
|
||||||
{
|
{
|
||||||
if(progressItem.width + progressLabel.width < control.width)
|
if(progressItem.width + progressLabel.width + 16 < control.width)
|
||||||
{
|
{
|
||||||
return progressItem.width + UM.Theme.getSize("default_margin").width
|
return progressItem.width + UM.Theme.getSize("default_margin").width
|
||||||
}
|
}
|
||||||
|
@ -774,24 +774,7 @@ Component
|
||||||
anchors.leftMargin: getTextOffset()
|
anchors.leftMargin: getTextOffset()
|
||||||
text: progressText
|
text: progressText
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
// color: progressItem.width + progressLabel.width < control.width ? "black" : "white"
|
color: progressItem.width + progressLabel.width < control.width ? "black" : "white"
|
||||||
color:
|
|
||||||
{
|
|
||||||
var state = modelData.activePrintJob.state
|
|
||||||
var inactiveStates = [
|
|
||||||
"pausing",
|
|
||||||
"paused",
|
|
||||||
"resuming",
|
|
||||||
"wait_cleanup"
|
|
||||||
]
|
|
||||||
if(inactiveStates.indexOf(state) > -1 && remainingTime > 0)
|
|
||||||
{
|
|
||||||
return "black"
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return progressItem.width + progressLabel.width < control.width ? "black" : "white"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
width: contentWidth
|
width: contentWidth
|
||||||
font: UM.Theme.getFont("default")
|
font: UM.Theme.getFont("default")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue