HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 18:50:54 +00:00
Code Actions Packages Releases Activity

final touches... for real this time;

Browse Source
This commit is contained in:
lgtst 2022-06-28 10:56:34 +03:00
parent e5f4be1711
commit e07f637cb3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/visual/TextBox.js
View File

@ -251,7 +251,7 @@ export class TextBox extends util.mix(VisualStim).with(ColorMixin)
if (this._pixi !== undefined) { if (this._pixi !== undefined) {
let alignmentStyles = TextBox._alignmentToFlexboxMap.get(alignment); let alignmentStyles = TextBox._alignmentToFlexboxMap.get(alignment);
if (!alignmentStyles) { if (!alignmentStyles) {
alignmentStyles = ["flex-start", "left"]; alignmentStyles = ["center", "center"];
} }
this._pixi.setInputStyle("justifyContent", alignmentStyles[0]); this._pixi.setInputStyle("justifyContent", alignmentStyles[0]);
this._pixi.setInputStyle("text-align", alignmentStyles[1]); this._pixi.setInputStyle("text-align", alignmentStyles[1]);
@ -527,6 +527,10 @@ export class TextBox extends util.mix(VisualStim).with(ColorMixin)
const borderWidth_px = Math.round(this._getLengthPix(this._borderWidth)); const borderWidth_px = Math.round(this._getLengthPix(this._borderWidth));
const width_px = Math.abs(Math.round(this._getLengthPix(this._size[0]))); const width_px = Math.abs(Math.round(this._getLengthPix(this._size[0])));
const height_px = Math.abs(Math.round(this._getLengthPix(this._size[1]))); const height_px = Math.abs(Math.round(this._getLengthPix(this._size[1])));
let alignmentStyles = TextBox._alignmentToFlexboxMap.get(this._alignment);
if (!alignmentStyles) {
alignmentStyles = ["center", "center"];
}
return { return {
// input style properties eventually become CSS, so same syntax applies // input style properties eventually become CSS, so same syntax applies
@ -539,7 +543,8 @@ export class TextBox extends util.mix(VisualStim).with(ColorMixin)
fontWeight: (this._bold) ? "bold" : "normal", fontWeight: (this._bold) ? "bold" : "normal",
fontStyle: (this._italic) ? "italic" : "normal", fontStyle: (this._italic) ? "italic" : "normal",
direction: util.TEXT_DIRECTION[this._languageStyle], direction: util.TEXT_DIRECTION[this._languageStyle],
textAlign: this._alignment, justifyContent: alignmentStyles[0],
textAlign: alignmentStyles[1],
padding: `${padding_px}px`, padding: `${padding_px}px`,
multiline: this._multiline, multiline: this._multiline,
text: this._text, text: this._text,