From d0915e106e2d819c6da8ee385a132040c09ef657 Mon Sep 17 00:00:00 2001 From: AlexandreS <32449369+AlexandreSi@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:18:45 +0100 Subject: [PATCH] Use 1 as default value for text input padding --- Extensions/TextInput/JsExtension.js | 9 +++++++-- Extensions/TextInput/textinputruntimeobject.ts | 9 ++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Extensions/TextInput/JsExtension.js b/Extensions/TextInput/JsExtension.js index e89167677b4c..938fedc89a3d 100644 --- a/Extensions/TextInput/JsExtension.js +++ b/Extensions/TextInput/JsExtension.js @@ -211,7 +211,12 @@ module.exports = { objectProperties .getOrCreate('padding') - .setValue((objectContent.padding || 0).toString()) + .setValue( + (objectContent.padding !== undefined + ? objectContent.padding + : 1 + ).toString() + ) .setType('number') .setLabel(_('Padding')) .setGroup(_('Font')); @@ -253,7 +258,7 @@ module.exports = { borderWidth: 1, readOnly: false, disabled: false, - padding: 0, + padding: 1, textAlign: 'left', maxLength: 0, }; diff --git a/Extensions/TextInput/textinputruntimeobject.ts b/Extensions/TextInput/textinputruntimeobject.ts index 3520ee4d8523..6fc316b3f7a5 100644 --- a/Extensions/TextInput/textinputruntimeobject.ts +++ b/Extensions/TextInput/textinputruntimeobject.ts @@ -135,7 +135,10 @@ namespace gdjs { this._readOnly = objectData.content.readOnly; this._textAlign = parseTextAlign(objectData.content.textAlign); //textAlign is defaulted to 'left' by the parser if undefined. this._maxLength = objectData.content.maxLength || 0; //maxlength and padding require a default value as they can be undefined in older projects. - this._padding = objectData.content.padding || 0; + this._padding = + objectData.content.padding !== undefined + ? objectData.content.padding + : 1; this._isSubmitted = false; this._renderer = new gdjs.TextInputRuntimeObjectRenderer( this, @@ -213,7 +216,7 @@ namespace gdjs { this.setReadOnly(newObjectData.content.readOnly); } if ( - newObjectData.content.maxLength && + newObjectData.content.maxLength !== undefined && oldObjectData.content.maxLength !== newObjectData.content.maxLength ) { this.setMaxLength(newObjectData.content.maxLength); @@ -225,7 +228,7 @@ namespace gdjs { this._textAlign = newObjectData.content.textAlign; } if ( - newObjectData.content.padding && + newObjectData.content.padding !== undefined && oldObjectData.content.padding !== newObjectData.content.padding ) { this.setPadding(newObjectData.content.padding);