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

Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment

Browse Source
This commit is contained in:
ChrisTerBeke 2017-09-27 16:37:40 +02:00
commit e948f54ada
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/CuraApplication.py
View File

@ -211,7 +211,7 @@ class CuraApplication(QtApplication):
self.setRequiredPlugins([ self.setRequiredPlugins([
"CuraEngineBackend", "CuraEngineBackend",
"MeshView", "SolidView",
"LayerView", "LayerView",
"STLReader", "STLReader",
"SelectionTool", "SelectionTool",

26
resources/qml/SidebarSimple.qml
View File

@ -186,7 +186,10 @@ Item
x: { x: {
// Make sure the text aligns correctly with each tick // Make sure the text aligns correctly with each tick
if (index == 0) { if (qualityModel.totalTicks == 0) {
// If there is only one tick, align it centrally
return ((base.width * 0.55) - width) / 2
} else if (index == 0) {
return (base.width * 0.55 / qualityModel.totalTicks) * index return (base.width * 0.55 / qualityModel.totalTicks) * index
} else if (index == qualityModel.totalTicks) { } else if (index == qualityModel.totalTicks) {
return (base.width * 0.55 / qualityModel.totalTicks) * index - width return (base.width * 0.55 / qualityModel.totalTicks) * index - width
@ -223,7 +226,7 @@ Item
Repeater Repeater
{ {
id: qualityRepeater id: qualityRepeater
model: qualityModel model: qualityModel.availableTotalTicks > 0 ? qualityModel : 0
Rectangle Rectangle
{ {
@ -236,13 +239,22 @@ Item
} }
} }
Rectangle {
id: disabledHandleButton
visible: !qualitySlider.visible
anchors.centerIn: parent
color: UM.Theme.getColor("quality_slider_unavailable")
implicitWidth: 10 * screenScaleFactor
implicitHeight: implicitWidth
radius: width / 2
}
Slider Slider
{ {
id: qualitySlider id: qualitySlider
height: UM.Theme.getSize("sidebar_margin").height height: UM.Theme.getSize("sidebar_margin").height
anchors.bottom: speedSlider.bottom anchors.bottom: speedSlider.bottom
enabled: qualityModel.availableTotalTicks > 0 visible: qualityModel.availableTotalTicks > 0
updateValueWhileDragging : false updateValueWhileDragging : false
minimumValue: qualityModel.qualitySliderAvailableMin >= 0 ? qualityModel.qualitySliderAvailableMin : 0 minimumValue: qualityModel.qualitySliderAvailableMin >= 0 ? qualityModel.qualitySliderAvailableMin : 0
@ -262,16 +274,16 @@ Item
groove: Rectangle { groove: Rectangle {
implicitHeight: 2 * screenScaleFactor implicitHeight: 2 * screenScaleFactor
color: UM.Theme.getColor("quality_slider_available") color: UM.Theme.getColor("quality_slider_available")
radius: 1 * screenScaleFactor radius: height / 2
} }
handle: Item { handle: Item {
Rectangle { Rectangle {
id: qualityhandleButton id: qualityhandleButton
anchors.centerIn: parent anchors.centerIn: parent
color: control.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") color: UM.Theme.getColor("quality_slider_available")
implicitWidth: 10 * screenScaleFactor implicitWidth: 10 * screenScaleFactor
implicitHeight: 10 * screenScaleFactor implicitHeight: implicitWidth
radius: 10 * screenScaleFactor radius: implicitWidth / 2
} }
} }
} }