diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2017-12-15 11:53:56 +0200 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2018-01-12 08:33:15 +0000 |
| commit | 0707c13c34653066c89d5b25abe60a779650ee27 (patch) | |
| tree | 83d6556f01eda5c7977b505bbe1b0d74a2eb62ee /src/Runtime/res | |
| parent | 4607f5ff35da9642e656476b78b1318bca7a1fa6 (diff) | |
[DataInput] Implement linking of Text element textstring to DataInput
Adds Text-element specific functionality that allows linking of text
element(s) "textstring" property to DataInput. This link forwards any
changes in DataInput valuestr property to linked element property.
DataInput path is hardwired to "this.DataInput" in proto implementation.
Future patches will integrate DataInput selection dialog that allows
choosing controlling datainput from the ones currently in scene.
User-visible DataInput functionality is still disabled from editor.
Task-ID: QT3DS-338
Change-Id: I064c616f6cf651fc12f1e810c7b807ed5cc04555
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Runtime/res')
| -rw-r--r-- | src/Runtime/res/DataModelMetadata/en-us/MetaData.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml index 4b2c9fd8..344d747b 100644 --- a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml +++ b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml @@ -433,6 +433,8 @@ <Text> <Property name="name" formalName="Name" type="String" default="Text" hidden="True" /> <Property name="textstring" formalName="Text String" description="Text String" type="MultiLineString" default="Text" /> + <!-- Set controllable to true when enabling + <Property name="textstring" formalName="Text String" description="Text String" type="MultiLineString" default="Text" controllable="True" /> --> <Property name="textcolor" formalName="Text Color" description="Text Color" type="Color" default="1 1 1" /> <Property name="font" formalName="Font" description="Font" type="Font" default="TitilliumWeb-Regular" /> <!-- HW accelerated fonts not supported |