Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix loading of GUIs with custom fonts and add font controls to InputText and InputPassword #13129

Merged
merged 5 commits into from
Oct 19, 2022
Merged

Fix loading of GUIs with custom fonts and add font controls to InputText and InputPassword #13129

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb25915
Fix loading of docs with invalid fonts
carolhmj Sep 30, 2022
4de6af4
Warn of invalid font.
carolhmj Sep 30, 2022
271fba9
Merge branch 'master' into fixFontLoading
carolhmj Oct 18, 2022
102bfa8
Display text properties
carolhmj Oct 18, 2022
ffadf40
Avoid double parse.
carolhmj Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Display text properties
  • Loading branch information
@carolhmj
carolhmj committed Oct 18, 2022
commit 102bfa8471c7b2f0d9d9afda83155cbb8580bfff
3 changes: 2 additions & 1 deletion ...ditor/src/components/propertyTab/propertyGrids/gui/commonControlPropertyGridComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,8 @@ export class CommonControlPropertyGridComponent extends React.Component<ICommonC
verticalAlignment = (firstControl as TextBlock).textVerticalAlignment;
}

const showTextProperties = firstControl instanceof Container || firstControl.typeName === "TextBlock";
const showTextProperties =
firstControl instanceof Container || firstControl.typeName === "TextBlock" || firstControl.typeName === "InputText" || firstControl.typeName === "InputPassword";

const proxy = makeTargetsProxy(controls, this.props.onPropertyChangedObservable);
const getValue = (propertyName: ControlProperty) => {
Expand Down