diff options
| author | Remco Burema <r.burema@ultimaker.com> | 2021-09-16 23:27:52 +0300 |
|---|---|---|
| committer | Remco Burema <r.burema@ultimaker.com> | 2021-09-16 23:27:52 +0300 |
| commit | a987b9972a2ba4d4b022e083bd0cff55a4072d78 (patch) | |
| tree | 0abb554ba54852e2594009471dcdcc7fa138e08b /plugins/SimulationView | |
| parent | e119c4694416f562305d93d42f0306e5a70ab31c (diff) | |
| parent | 11b1998156632fc2ebd2b6b93fc2f27ae6bfc3ae (diff) | |
Merge branch 'master' into bremco-graphics_buffer_update
Diffstat (limited to 'plugins/SimulationView')
| -rw-r--r-- | plugins/SimulationView/LayerSlider.qml | 4 | ||||
| -rw-r--r-- | plugins/SimulationView/SimulationSliderLabel.qml | 2 | ||||
| -rw-r--r-- | plugins/SimulationView/SimulationViewMainComponent.qml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index d6de45df9b..d2a22755ae 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -187,7 +187,7 @@ Item { sliderRoot.manuallyChanged = true - // don't allow the lower handle to be heigher than the upper handle + // don't allow the lower handle to be higher than the upper handle if (lowerHandle.y - (y + height) < sliderRoot.minimumRangeHandleSize) { lowerHandle.y = y + height + sliderRoot.minimumRangeHandleSize @@ -300,7 +300,7 @@ Item // don't allow the upper handle to be lower than the lower handle if (y - (upperHandle.y + upperHandle.height) < sliderRoot.minimumRangeHandleSize) { - upperHandle.y = y - (upperHandle.heigth + sliderRoot.minimumRangeHandleSize) + upperHandle.y = y - (upperHandle.height + sliderRoot.minimumRangeHandleSize) } // update the range handle diff --git a/plugins/SimulationView/SimulationSliderLabel.qml b/plugins/SimulationView/SimulationSliderLabel.qml index c1fb0f4de9..afd02069eb 100644 --- a/plugins/SimulationView/SimulationSliderLabel.qml +++ b/plugins/SimulationView/SimulationSliderLabel.qml @@ -59,7 +59,7 @@ UM.PointingRectangle { text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array horizontalAlignment: TextInput.AlignHCenter - // key bindings, work when label is currenctly focused (active handle in LayerSlider) + // key bindings, work when label is currently focused (active handle in LayerSlider) Keys.onUpPressed: sliderLabelRoot.setValue(sliderLabelRoot.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1)) Keys.onDownPressed: sliderLabelRoot.setValue(sliderLabelRoot.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1)) diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index 9232516673..af60692273 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -190,11 +190,11 @@ Item } } - // Scrolls trough Z layers + // Scrolls through Z layers LayerSlider { property var preferredHeight: UM.Theme.getSize("slider_layerview_size").height - property double heightMargin: UM.Theme.getSize("default_margin").height * 3 // extra margin to accomodate layer number tooltips + property double heightMargin: UM.Theme.getSize("default_margin").height * 3 // extra margin to accommodate layer number tooltips property double layerSliderSafeHeight: layerSliderSafeYMax - layerSliderSafeYMin id: layerSlider |