Skip to content

Commit

Permalink
Added new functions for text shaping to API, update TextInput cursor
Browse files Browse the repository at this point in the history
  • Loading branch information
@fschutt
fschutt committed Aug 12, 2021
1 parent 907ad5b commit 2688fd0
Show file tree
Hide file tree
Showing 13 changed files with 822 additions and 86 deletions.
65 changes: 65 additions & 0 deletions api.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,14 @@
"returns": {"type": "OptionFontRef"},
"fn_body": "callbackinfo.get_font_ref(node_id).into()"
},
"get_text_layout_options": {
"fn_args": [
{"self": "ref"},
{"node_id": "DomNodeId"}
],
"returns": {"type": "OptionResolvedTextLayoutOptions"},
"fn_body": "callbackinfo.get_text_layout_options(node_id).into()"
},
"shape_text": {
"doc": "Similar to `get_inline_text()`: If the node is a `Text` node, shape the `text` string with the same parameters as the current text and return the calculated InlineTextLayout. Necessary to calculate text cursor offsets and to detect when a line overflows content.",
"fn_args": [
Expand Down Expand Up @@ -1668,6 +1676,19 @@
{"css_path": {"type": "CssPath"}}
]
},
"ResolvedTextLayoutOptions": {
"external": "azul_impl::ui_solver::ResolvedTextLayoutOptions",
"struct_fields": [
{"font_size_px": {"type": "f32"}},
{"line_height": {"type": "OptionF32"}},
{"letter_spacing": {"type": "OptionF32"}},
{"word_spacing": {"type": "OptionF32"}},
{"tab_width": {"type": "OptionF32"}},
{"max_horizontal_width": {"type": "OptionF32"}},
{"leading": {"type": "OptionF32"}},
{"holes": {"type": "LogicalRectVec"}}
]
},
"Animation": {
"doc": "Animation struct to start a new animation",
"external": "azul_impl::callbacks::Animation",
Expand Down Expand Up @@ -10705,6 +10726,16 @@
],
"returns": {"type": "FontMetrics"},
"fn_body": "azul_impl::text_layout::get_font_metrics_fontref(fontref)"
},
"shape_text": {
"doc": "Returns the text layout of the shaped text",
"fn_args": [
{"self": "ref"},
{"text": "Refstr"},
{"options": "ResolvedTextLayoutOptions"}
],
"returns": {"type": "InlineText"},
"fn_body": "azul_impl::text_layout::shape_text(fontref, text.as_str(), &options)"
}
}
}
Expand Down Expand Up @@ -12014,6 +12045,17 @@
"vec": {
"doc": "Definition of azuls internal `Vec<*>` wrappers",
"classes": {
"LogicalRectVec": {
"doc": "Wrapper over a Rust-allocated `Vec<LogicalRect>`",
"custom_destructor": true,
"external": "azul_core::window::LogicalRectVec",
"struct_fields": [
{ "ptr": { "type": "*const LogicalRect" } },
{ "len": { "type": "usize" } },
{ "cap": { "type": "usize" } },
{ "destructor": { "type": "LogicalRectVecDestructor" } }
]
},
"NodeTypeIdInfoMapVec": {
"doc": "Wrapper over a Rust-allocated `Vec<NodeTypeIdInfoMap>`",
"custom_destructor": true,
Expand Down Expand Up @@ -12743,6 +12785,22 @@
]
}
},
"LogicalRectVecDestructor": {
"external": "azul_core::window::LogicalRectVecDestructor",
"derive": ["Copy"],
"enum_fields": [
{"DefaultRust": {}},
{"NoDestructor": {}},
{"External": {"type": "LogicalRectVecDestructorType"}}
]
},
"LogicalRectVecDestructorType": {
"callback_typedef": {
"fn_args": [
{"type": "LogicalRectVec", "ref": "refmut"}
]
}
},
"NodeTypeIdInfoMapVecDestructor": {
"external": "crate::widgets::node_graph::NodeTypeIdInfoMapVecDestructor",
"derive": ["Copy"],
Expand Down Expand Up @@ -13724,6 +13782,13 @@
"option": {
"doc": "Definition of azuls internal `Option<*>` wrappers",
"classes": {
"OptionResolvedTextLayoutOptions": {
"external": "azul_impl::ui_solver::OptionResolvedTextLayoutOptions",
"enum_fields": [
{"None": {}},
{"Some": {"type": "ResolvedTextLayoutOptions"}}
]
},
"OptionNodeGraphOnNodeAdded": {
"external": "crate::widgets::node_graph::OptionOnNodeAdded",
"enum_fields": [
Expand Down
102 changes: 102 additions & 0 deletions api/c/azul.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ struct AzStyleFontFamilyVec;
typedef struct AzStyleFontFamilyVec AzStyleFontFamilyVec;
typedef void (*AzStyleFontFamilyVecDestructorType)(AzStyleFontFamilyVec* restrict A);

struct AzLogicalRectVec;
typedef struct AzLogicalRectVec AzLogicalRectVec;
typedef void (*AzLogicalRectVecDestructorType)(AzLogicalRectVec* restrict A);

struct AzNodeTypeIdInfoMapVec;
typedef struct AzNodeTypeIdInfoMapVec AzNodeTypeIdInfoMapVec;
typedef void (*AzNodeTypeIdInfoMapVecDestructorType)(AzNodeTypeIdInfoMapVec* restrict A);
Expand Down Expand Up @@ -2170,6 +2174,26 @@ union AzStyleFontFamilyVecDestructor {
};
typedef union AzStyleFontFamilyVecDestructor AzStyleFontFamilyVecDestructor;

enum AzLogicalRectVecDestructorTag {
AzLogicalRectVecDestructorTag_DefaultRust,
AzLogicalRectVecDestructorTag_NoDestructor,
AzLogicalRectVecDestructorTag_External,
};
typedef enum AzLogicalRectVecDestructorTag AzLogicalRectVecDestructorTag;

struct AzLogicalRectVecDestructorVariant_DefaultRust { AzLogicalRectVecDestructorTag tag; };
typedef struct AzLogicalRectVecDestructorVariant_DefaultRust AzLogicalRectVecDestructorVariant_DefaultRust;
struct AzLogicalRectVecDestructorVariant_NoDestructor { AzLogicalRectVecDestructorTag tag; };
typedef struct AzLogicalRectVecDestructorVariant_NoDestructor AzLogicalRectVecDestructorVariant_NoDestructor;
struct AzLogicalRectVecDestructorVariant_External { AzLogicalRectVecDestructorTag tag; AzLogicalRectVecDestructorType payload; };
typedef struct AzLogicalRectVecDestructorVariant_External AzLogicalRectVecDestructorVariant_External;
union AzLogicalRectVecDestructor {
AzLogicalRectVecDestructorVariant_DefaultRust DefaultRust;
AzLogicalRectVecDestructorVariant_NoDestructor NoDestructor;
AzLogicalRectVecDestructorVariant_External External;
};
typedef union AzLogicalRectVecDestructor AzLogicalRectVecDestructor;

enum AzNodeTypeIdInfoMapVecDestructorTag {
AzNodeTypeIdInfoMapVecDestructorTag_DefaultRust,
AzNodeTypeIdInfoMapVecDestructorTag_NoDestructor,
Expand Down Expand Up @@ -6260,6 +6284,14 @@ struct AzThreadWriteBackMsg {
};
typedef struct AzThreadWriteBackMsg AzThreadWriteBackMsg;

struct AzLogicalRectVec {
AzLogicalRect* ptr;
size_t len;
size_t cap;
AzLogicalRectVecDestructor destructor;
};
typedef struct AzLogicalRectVec AzLogicalRectVec;

struct AzInputOutputTypeIdVec {
AzInputOutputTypeId* ptr;
size_t len;
Expand Down Expand Up @@ -7452,6 +7484,18 @@ struct AzInlineTextContents {
};
typedef struct AzInlineTextContents AzInlineTextContents;

struct AzResolvedTextLayoutOptions {
float font_size_px;
AzOptionF32 line_height;
AzOptionF32 letter_spacing;
AzOptionF32 word_spacing;
AzOptionF32 tab_width;
AzOptionF32 max_horizontal_width;
AzOptionF32 leading;
AzLogicalRectVec holes;
};
typedef struct AzResolvedTextLayoutOptions AzResolvedTextLayoutOptions;

enum AzAnimationEasingTag {
AzAnimationEasingTag_Ease,
AzAnimationEasingTag_Linear,
Expand Down Expand Up @@ -8081,6 +8125,22 @@ struct AzTagIdToNodeIdMappingVec {
};
typedef struct AzTagIdToNodeIdMappingVec AzTagIdToNodeIdMappingVec;

enum AzOptionResolvedTextLayoutOptionsTag {
AzOptionResolvedTextLayoutOptionsTag_None,
AzOptionResolvedTextLayoutOptionsTag_Some,
};
typedef enum AzOptionResolvedTextLayoutOptionsTag AzOptionResolvedTextLayoutOptionsTag;

struct AzOptionResolvedTextLayoutOptionsVariant_None { AzOptionResolvedTextLayoutOptionsTag tag; };
typedef struct AzOptionResolvedTextLayoutOptionsVariant_None AzOptionResolvedTextLayoutOptionsVariant_None;
struct AzOptionResolvedTextLayoutOptionsVariant_Some { AzOptionResolvedTextLayoutOptionsTag tag; AzResolvedTextLayoutOptions payload; };
typedef struct AzOptionResolvedTextLayoutOptionsVariant_Some AzOptionResolvedTextLayoutOptionsVariant_Some;
union AzOptionResolvedTextLayoutOptions {
AzOptionResolvedTextLayoutOptionsVariant_None None;
AzOptionResolvedTextLayoutOptionsVariant_Some Some;
};
typedef union AzOptionResolvedTextLayoutOptions AzOptionResolvedTextLayoutOptions;

enum AzOptionVirtualKeyCodeComboTag {
AzOptionVirtualKeyCodeComboTag_None,
AzOptionVirtualKeyCodeComboTag_Some,
Expand Down Expand Up @@ -10343,6 +10403,9 @@ typedef struct AzCss AzCss;
#define AzStyleFontFamilyVecDestructor_DefaultRust { .DefaultRust = { .tag = AzStyleFontFamilyVecDestructorTag_DefaultRust } }
#define AzStyleFontFamilyVecDestructor_NoDestructor { .NoDestructor = { .tag = AzStyleFontFamilyVecDestructorTag_NoDestructor } }
#define AzStyleFontFamilyVecDestructor_External(v) { .External = { .tag = AzStyleFontFamilyVecDestructorTag_External, .payload = v } }
#define AzLogicalRectVecDestructor_DefaultRust { .DefaultRust = { .tag = AzLogicalRectVecDestructorTag_DefaultRust } }
#define AzLogicalRectVecDestructor_NoDestructor { .NoDestructor = { .tag = AzLogicalRectVecDestructorTag_NoDestructor } }
#define AzLogicalRectVecDestructor_External(v) { .External = { .tag = AzLogicalRectVecDestructorTag_External, .payload = v } }
#define AzNodeTypeIdInfoMapVecDestructor_DefaultRust { .DefaultRust = { .tag = AzNodeTypeIdInfoMapVecDestructorTag_DefaultRust } }
#define AzNodeTypeIdInfoMapVecDestructor_NoDestructor { .NoDestructor = { .tag = AzNodeTypeIdInfoMapVecDestructorTag_NoDestructor } }
#define AzNodeTypeIdInfoMapVecDestructor_External(v) { .External = { .tag = AzNodeTypeIdInfoMapVecDestructorTag_External, .payload = v } }
Expand Down Expand Up @@ -11067,6 +11130,8 @@ typedef struct AzCss AzCss;
#define AzInstant_Tick(v) { .Tick = { .tag = AzInstantTag_Tick, .payload = v } }
#define AzThreadReceiveMsg_WriteBack(v) { .WriteBack = { .tag = AzThreadReceiveMsgTag_WriteBack, .payload = v } }
#define AzThreadReceiveMsg_Update(v) { .Update = { .tag = AzThreadReceiveMsgTag_Update, .payload = v } }
#define AzOptionResolvedTextLayoutOptions_None { .None = { .tag = AzOptionResolvedTextLayoutOptionsTag_None } }
#define AzOptionResolvedTextLayoutOptions_Some(v) { .Some = { .tag = AzOptionResolvedTextLayoutOptionsTag_Some, .payload = v } }
#define AzOptionVirtualKeyCodeCombo_None { .None = { .tag = AzOptionVirtualKeyCodeComboTag_None } }
#define AzOptionVirtualKeyCodeCombo_Some(v) { .Some = { .tag = AzOptionVirtualKeyCodeComboTag_Some, .payload = v } }
#define AzOptionMouseState_None { .None = { .tag = AzOptionMouseStateTag_None } }
Expand Down Expand Up @@ -11321,6 +11386,10 @@ typedef struct AzCss AzCss;
#define AzResultSvgXmlNodeSvgParseError_Err(v) { .Err = { .tag = AzResultSvgXmlNodeSvgParseErrorTag_Err, .payload = v } }
#define AzResultSvgSvgParseError_Ok(v) { .Ok = { .tag = AzResultSvgSvgParseErrorTag_Ok, .payload = v } }
#define AzResultSvgSvgParseError_Err(v) { .Err = { .tag = AzResultSvgSvgParseErrorTag_Err, .payload = v } }
AzLogicalRect AzLogicalRectVecArray[] = {};
#define AzLogicalRectVec_fromConstArray(v) { .ptr = &v, .len = sizeof(v) / sizeof(AzLogicalRect), .cap = sizeof(v) / sizeof(AzLogicalRect), .destructor = { .NoDestructor = { .tag = AzLogicalRectVecDestructorTag_NoDestructor, }, }, }
#define AzLogicalRectVec_empty { .ptr = &AzLogicalRectVecArray, .len = 0, .cap = 0, .destructor = { .NoDestructor = { .tag = AzLogicalRectVecDestructorTag_NoDestructor, }, }, }

AzNodeTypeIdInfoMap AzNodeTypeIdInfoMapVecArray[] = {};
#define AzNodeTypeIdInfoMapVec_fromConstArray(v) { .ptr = &v, .len = sizeof(v) / sizeof(AzNodeTypeIdInfoMap), .cap = sizeof(v) / sizeof(AzNodeTypeIdInfoMap), .destructor = { .NoDestructor = { .tag = AzNodeTypeIdInfoMapVecDestructorTag_NoDestructor, }, }, }
#define AzNodeTypeIdInfoMapVec_empty { .ptr = &AzNodeTypeIdInfoMapVecArray, .len = 0, .cap = 0, .destructor = { .NoDestructor = { .tag = AzNodeTypeIdInfoMapVecDestructorTag_NoDestructor, }, }, }
Expand Down Expand Up @@ -11616,6 +11685,7 @@ extern DLLIMPORT AzOptionDomNodeId AzCallbackInfo_getNodeIdOfRootDataset(AzCallb
extern DLLIMPORT AzOptionString AzCallbackInfo_getStringContents(const AzCallbackInfo* callbackinfo, AzDomNodeId node_id);
extern DLLIMPORT AzOptionInlineText AzCallbackInfo_getInlineText(const AzCallbackInfo* callbackinfo, AzDomNodeId node_id);
extern DLLIMPORT AzOptionFontRef AzCallbackInfo_getFontRef(const AzCallbackInfo* callbackinfo, AzDomNodeId node_id);
extern DLLIMPORT AzOptionResolvedTextLayoutOptions AzCallbackInfo_getTextLayoutOptions(const AzCallbackInfo* callbackinfo, AzDomNodeId node_id);
extern DLLIMPORT AzOptionInlineText AzCallbackInfo_shapeText(const AzCallbackInfo* callbackinfo, AzDomNodeId node_id, AzString text);
extern DLLIMPORT size_t AzCallbackInfo_getIndexInParent(AzCallbackInfo* restrict callbackinfo, AzDomNodeId node_id);
extern DLLIMPORT AzOptionDomNodeId AzCallbackInfo_getParent(AzCallbackInfo* restrict callbackinfo, AzDomNodeId node_id);
Expand Down Expand Up @@ -11656,6 +11726,7 @@ extern DLLIMPORT void AzInlineWord_delete(AzInlineWord* restrict instance);
extern DLLIMPORT void AzInlineTextContents_delete(AzInlineTextContents* restrict instance);
extern DLLIMPORT void AzFocusTarget_delete(AzFocusTarget* restrict instance);
extern DLLIMPORT void AzFocusTargetPath_delete(AzFocusTargetPath* restrict instance);
extern DLLIMPORT void AzResolvedTextLayoutOptions_delete(AzResolvedTextLayoutOptions* restrict instance);
extern DLLIMPORT void AzAnimation_delete(AzAnimation* restrict instance);
extern DLLIMPORT void AzIFrameCallbackReturn_delete(AzIFrameCallbackReturn* restrict instance);
extern DLLIMPORT AzOptionGl AzRenderImageCallbackInfo_getGlContext(const AzRenderImageCallbackInfo* renderimagecallbackinfo);
Expand Down Expand Up @@ -12212,6 +12283,7 @@ extern DLLIMPORT void AzRawImageData_delete(AzRawImageData* restrict instance);
extern DLLIMPORT void AzFontSource_delete(AzFontSource* restrict instance);
extern DLLIMPORT AzFontRef AzFontRef_parse(AzFontSource source);
extern DLLIMPORT AzFontMetrics AzFontRef_getFontMetrics(const AzFontRef* fontref);
extern DLLIMPORT AzInlineText AzFontRef_shapeText(const AzFontRef* fontref, AzRefstr text, AzResolvedTextLayoutOptions options);
extern DLLIMPORT void AzFontRef_delete(AzFontRef* restrict instance);
extern DLLIMPORT AzFontRef AzFontRef_deepCopy(AzFontRef* const instance);
extern DLLIMPORT AzSvg AzSvg_fromString(AzString svg_string, AzSvgParseOptions parse_options);
Expand Down Expand Up @@ -12307,6 +12379,7 @@ extern DLLIMPORT AzString AzString_copyFromBytes(uint8_t ptr, size_t start, size
extern DLLIMPORT AzString AzString_trim(const AzString* string);
extern DLLIMPORT AzRefstr AzString_asRefstr(const AzString* string);
extern DLLIMPORT void AzString_delete(AzString* restrict instance);
extern DLLIMPORT void AzLogicalRectVec_delete(AzLogicalRectVec* restrict instance);
extern DLLIMPORT void AzNodeTypeIdInfoMapVec_delete(AzNodeTypeIdInfoMapVec* restrict instance);
extern DLLIMPORT void AzInputOutputTypeIdInfoMapVec_delete(AzInputOutputTypeIdInfoMapVec* restrict instance);
extern DLLIMPORT void AzNodeIdNodeMapVec_delete(AzNodeIdNodeMapVec* restrict instance);
Expand Down Expand Up @@ -12372,6 +12445,7 @@ extern DLLIMPORT void AzStyledNodeVec_delete(AzStyledNodeVec* restrict instance)
extern DLLIMPORT void AzTagIdToNodeIdMappingVec_delete(AzTagIdToNodeIdMappingVec* restrict instance);
extern DLLIMPORT void AzParentWithNodeDepthVec_delete(AzParentWithNodeDepthVec* restrict instance);
extern DLLIMPORT void AzNodeDataVec_delete(AzNodeDataVec* restrict instance);
extern DLLIMPORT void AzOptionResolvedTextLayoutOptions_delete(AzOptionResolvedTextLayoutOptions* restrict instance);
extern DLLIMPORT void AzOptionNodeGraphOnNodeAdded_delete(AzOptionNodeGraphOnNodeAdded* restrict instance);
extern DLLIMPORT void AzOptionNodeGraphOnNodeRemoved_delete(AzOptionNodeGraphOnNodeRemoved* restrict instance);
extern DLLIMPORT void AzOptionNodeGraphOnNodeGraphDragged_delete(AzOptionNodeGraphOnNodeGraphDragged* restrict instance);
Expand Down Expand Up @@ -17680,6 +17754,20 @@ bool AzStyleFontFamilyVecDestructor_matchMutExternal(AzStyleFontFamilyVecDestruc
return valid;
}

bool AzLogicalRectVecDestructor_matchRefExternal(const AzLogicalRectVecDestructor* value, const AzLogicalRectVecDestructorType** restrict out) {
const AzLogicalRectVecDestructorVariant_External* casted = (const AzLogicalRectVecDestructorVariant_External*)value;
bool valid = casted->tag == AzLogicalRectVecDestructorTag_External;
if (valid) { *out = &casted->payload; } else { *out = 0; }
return valid;
}

bool AzLogicalRectVecDestructor_matchMutExternal(AzLogicalRectVecDestructor* restrict value, AzLogicalRectVecDestructorType* restrict * restrict out) {
AzLogicalRectVecDestructorVariant_External* restrict casted = (AzLogicalRectVecDestructorVariant_External* restrict)value;
bool valid = casted->tag == AzLogicalRectVecDestructorTag_External;
if (valid) { *out = &casted->payload; } else { *out = 0; }
return valid;
}

bool AzNodeTypeIdInfoMapVecDestructor_matchRefExternal(const AzNodeTypeIdInfoMapVecDestructor* value, const AzNodeTypeIdInfoMapVecDestructorType** restrict out) {
const AzNodeTypeIdInfoMapVecDestructorVariant_External* casted = (const AzNodeTypeIdInfoMapVecDestructorVariant_External*)value;
bool valid = casted->tag == AzNodeTypeIdInfoMapVecDestructorTag_External;
Expand Down Expand Up @@ -18534,6 +18622,20 @@ bool AzNodeDataVecDestructor_matchMutExternal(AzNodeDataVecDestructor* restrict
return valid;
}

bool AzOptionResolvedTextLayoutOptions_matchRefSome(const AzOptionResolvedTextLayoutOptions* value, const AzResolvedTextLayoutOptions** restrict out) {
const AzOptionResolvedTextLayoutOptionsVariant_Some* casted = (const AzOptionResolvedTextLayoutOptionsVariant_Some*)value;
bool valid = casted->tag == AzOptionResolvedTextLayoutOptionsTag_Some;
if (valid) { *out = &casted->payload; } else { *out = 0; }
return valid;
}

bool AzOptionResolvedTextLayoutOptions_matchMutSome(AzOptionResolvedTextLayoutOptions* restrict value, AzResolvedTextLayoutOptions* restrict * restrict out) {
AzOptionResolvedTextLayoutOptionsVariant_Some* restrict casted = (AzOptionResolvedTextLayoutOptionsVariant_Some* restrict)value;
bool valid = casted->tag == AzOptionResolvedTextLayoutOptionsTag_Some;
if (valid) { *out = &casted->payload; } else { *out = 0; }
return valid;
}

bool AzOptionNodeGraphOnNodeAdded_matchRefSome(const AzOptionNodeGraphOnNodeAdded* value, const AzNodeGraphOnNodeAdded** restrict out) {
const AzOptionNodeGraphOnNodeAddedVariant_Some* casted = (const AzOptionNodeGraphOnNodeAddedVariant_Some*)value;
bool valid = casted->tag == AzOptionNodeGraphOnNodeAddedTag_Some;
Expand Down
Loading

0 comments on commit 2688fd0

Please sign in to comment.