Skip to content

Commit

Permalink
Use 1 as default value for text input padding
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexandreSi committed Jan 23, 2025
1 parent 268c32f commit d0915e1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
9 changes: 7 additions & 2 deletions Extensions/TextInput/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down Expand Up @@ -253,7 +258,7 @@ module.exports = {
borderWidth: 1,
readOnly: false,
disabled: false,
padding: 0,
padding: 1,
textAlign: 'left',
maxLength: 0,
};
Expand Down
9 changes: 6 additions & 3 deletions Extensions/TextInput/textinputruntimeobject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit d0915e1

Please sign in to comment.