More text changes
This commit is contained in:
@@ -12,8 +12,6 @@ class Div : public Element {
|
||||
virtual void applyStyle(Style parentStyle) override {
|
||||
style = parentStyle;
|
||||
style.outerDisplay = OuterDisplayType::Block;
|
||||
style.widthType = DimensionType::Percent;
|
||||
style.width = 100;
|
||||
(classes::apply(style), ...);
|
||||
}
|
||||
private:
|
||||
|
||||
@@ -15,9 +15,9 @@ template <StyleClass... classes> class Text : public Element {
|
||||
virtual void layout(UVector2 parentSize) override {
|
||||
size_t cursor = 0;
|
||||
for (uint32 i = 0; i < text.size() - 1; ++i) {
|
||||
dimensions.x += style.fontFamily->getGlyphData(text[i]).advance / 64.0f;
|
||||
dimensions.x += style.fontFamily->getGlyphData(text[i], style.fontSize).advance / 64.0f;
|
||||
}
|
||||
dimensions.x += style.fontFamily->getGlyphData(text[text.size() - 1]).size.x;
|
||||
dimensions.x += style.fontFamily->getGlyphData(text[text.size() - 1], style.fontSize).size.x;
|
||||
dimensions.y = style.fontSize;
|
||||
}
|
||||
virtual Array<UIRender> render(Vector2 anchor, uint32 level) override {
|
||||
@@ -28,6 +28,7 @@ template <StyleClass... classes> class Text : public Element {
|
||||
.fontSize = style.fontSize,
|
||||
.position = position + anchor,
|
||||
.dimensions = dimensions,
|
||||
.baseline = style.fontSize * 3 / 4, // TODO: improve
|
||||
.z = style.z,
|
||||
.level = level,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user