diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index e81d3e7dd6..5dd7bc3a0d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3776,8 +3776,8 @@ "default_value": 200, "minimum_value_warning": "-1000", "maximum_value_warning": "1000", - "maximum_value": "machine_width - 0.5 * resolveOrValue('prime_tower_size')", - "minimum_value": "0.5 * resolveOrValue('prime_tower_size')", + "maximum_value": "machine_width", + "minimum_value": "resolveOrValue('prime_tower_size')", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -3791,8 +3791,8 @@ "default_value": 200, "minimum_value_warning": "-1000", "maximum_value_warning": "1000", - "maximum_value": "machine_depth - 0.5 * resolveOrValue('prime_tower_size')", - "minimum_value": "0.5 * resolveOrValue('prime_tower_size')", + "maximum_value": "machine_depth - resolveOrValue('prime_tower_size')", + "minimum_value": "0", "settable_per_mesh": false, "settable_per_extruder": false }, diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index 427b482cea..da24f0f521 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -100,7 +100,7 @@ SettingItem maximumLength: 10; - validator: RegExpValidator { regExp: (definition.type == "int") ? /^-?[0-9]{0,10}$/ : /^-?[0-9]?[.,]?[0-9]{0,10}$/ } // definition.type property from parent loader used to disallow fractional number entry + validator: RegExpValidator { regExp: (definition.type == "int") ? /^-?[0-9]{0,10}$/ : /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } // definition.type property from parent loader used to disallow fractional number entry Binding {