mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
add centered text layout modes
top-aligned has been tested. bottom aligned has yet to be tested.
This commit is contained in:
parent
37b2ee444d
commit
7eac66b373
2 changed files with 39 additions and 0 deletions
|
|
@ -15,6 +15,10 @@ pub enum TextBounds {
|
||||||
GrowableFromBl(Point, u16),
|
GrowableFromBl(Point, u16),
|
||||||
// fixed width, grows down from top right
|
// fixed width, grows down from top right
|
||||||
GrowableFromTr(Point, u16),
|
GrowableFromTr(Point, u16),
|
||||||
|
// fixed width, centered aligned top
|
||||||
|
CenteredTop(Rectangle),
|
||||||
|
// fixed width, centered aligned bottom
|
||||||
|
CenteredBot(Rectangle),
|
||||||
}
|
}
|
||||||
impl TextBounds {
|
impl TextBounds {
|
||||||
pub fn translate(&self, by: Point) -> TextBounds {
|
pub fn translate(&self, by: Point) -> TextBounds {
|
||||||
|
|
@ -35,6 +39,14 @@ impl TextBounds {
|
||||||
TextBounds::GrowableFromTr(origin, width) => {
|
TextBounds::GrowableFromTr(origin, width) => {
|
||||||
TextBounds::GrowableFromTr(origin.add(by), width)
|
TextBounds::GrowableFromTr(origin.add(by), width)
|
||||||
}
|
}
|
||||||
|
TextBounds::CenteredTop(mut r) => {
|
||||||
|
r.translate(by);
|
||||||
|
TextBounds::BoundingBox(r)
|
||||||
|
}
|
||||||
|
TextBounds::CenteredBot(mut r) => {
|
||||||
|
r.translate(by);
|
||||||
|
TextBounds::BoundingBox(r)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -247,6 +247,10 @@ fn wrapped_main() -> ! {
|
||||||
Pt::new(width as i16 - tv.margin.x * 2, (clip_rect.br().y - clip_rect.tl().y - tl.y) - tv.margin.y * 2),
|
Pt::new(width as i16 - tv.margin.x * 2, (clip_rect.br().y - clip_rect.tl().y - tl.y) - tv.margin.y * 2),
|
||||||
TextBounds::GrowableFromTr(tr, width) =>
|
TextBounds::GrowableFromTr(tr, width) =>
|
||||||
Pt::new(width as i16 - tv.margin.x * 2, (clip_rect.br().y - clip_rect.tl().y - tr.y) - tv.margin.y * 2),
|
Pt::new(width as i16 - tv.margin.x * 2, (clip_rect.br().y - clip_rect.tl().y - tr.y) - tv.margin.y * 2),
|
||||||
|
TextBounds::CenteredTop(r) =>
|
||||||
|
Pt::new(r.br().x - r.tl().x - tv.margin.x * 2, r.br().y - r.tl().y - tv.margin.y * 2),
|
||||||
|
TextBounds::CenteredBot(r) =>
|
||||||
|
Pt::new(r.br().x - r.tl().x - tv.margin.x * 2, r.br().y - r.tl().y - tv.margin.y * 2),
|
||||||
};
|
};
|
||||||
let mut typesetter = Typesetter::setup(
|
let mut typesetter = Typesetter::setup(
|
||||||
tv.to_str(),
|
tv.to_str(),
|
||||||
|
|
@ -274,6 +278,29 @@ fn wrapped_main() -> ! {
|
||||||
tl.add(tv.margin),
|
tl.add(tv.margin),
|
||||||
TextBounds::GrowableFromTr(tr, _width) =>
|
TextBounds::GrowableFromTr(tr, _width) =>
|
||||||
Point::new(tr.x - (composition.bb_width() as i16 + tv.margin.x), tr.y + tv.margin.y),
|
Point::new(tr.x - (composition.bb_width() as i16 + tv.margin.x), tr.y + tv.margin.y),
|
||||||
|
TextBounds::CenteredTop(r) => {
|
||||||
|
if r.width() as i16 > composition.bb_width() {
|
||||||
|
r.tl().add(Point::new(
|
||||||
|
(r.width() as i16 - composition.bb_width()) / 2, 0
|
||||||
|
))
|
||||||
|
} else {
|
||||||
|
r.tl().add(tv.margin)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
TextBounds::CenteredBot(r) => {
|
||||||
|
if r.width() as i16 > composition.bb_width() {
|
||||||
|
r.tl().add(Point::new(
|
||||||
|
(r.width() as i16 - composition.bb_width()) / 2,
|
||||||
|
if (r.height() as i16) > (composition.bb_height() + tv.margin.y) {
|
||||||
|
(r.height() as i16) - (composition.bb_height() + tv.margin.y)
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
}
|
||||||
|
))
|
||||||
|
} else {
|
||||||
|
r.tl().add(tv.margin)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.add(screen_offset);
|
.add(screen_offset);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue