alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

JUSTIFY

Browse source
This commit is contained in:
Corwin 2023-07-02 00:38:52 +01:00
parent 9edbca582e
commit 9388098318
No known key found for this signature in database
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
agb/examples/object_text_render.rs
View file

@ -52,7 +52,7 @@ fn main(mut gba: agb::Gba) -> ! {
timer.set_enabled(true); timer.set_enabled(true);
timer.set_divider(agb::timer::Divider::Divider256); timer.set_divider(agb::timer::Divider::Divider256);
wr.layout((WIDTH, 40).into(), TextAlignment::Left, 2); wr.layout((WIDTH, 40).into(), TextAlignment::Justify, 2);
let mut line_done = false; let mut line_done = false;
let mut frame = 0; let mut frame = 0;

30
agb/src/display/object/font.rs
View file

@ -1,6 +1,6 @@
use core::fmt::{Display, Write}; use core::fmt::{Display, Write};
use agb_fixnum::Vector2D; use agb_fixnum::{Num, Vector2D};
use alloc::{collections::VecDeque, vec::Vec}; use alloc::{collections::VecDeque, vec::Vec};
use crate::display::Font; use crate::display::Font;
@ -53,10 +53,11 @@ pub enum TextAlignment {
Left, Left,
Right, Right,
Center, Center,
Justify,
} }
struct TextAlignmentSettings { struct TextAlignmentSettings {
space_width: i32, space_width: Num<i32, 10>,
start_x: i32, start_x: i32,
} }
@ -64,17 +65,30 @@ impl TextAlignment {
fn settings(self, line: &Line, minimum_space_width: i32, width: i32) -> TextAlignmentSettings { fn settings(self, line: &Line, minimum_space_width: i32, width: i32) -> TextAlignmentSettings {
match self { match self {
TextAlignment::Left => TextAlignmentSettings { TextAlignment::Left => TextAlignmentSettings {
space_width: minimum_space_width, space_width: minimum_space_width.into(),
start_x: 0, start_x: 0,
}, },
TextAlignment::Right => TextAlignmentSettings { TextAlignment::Right => TextAlignmentSettings {
space_width: minimum_space_width, space_width: minimum_space_width.into(),
start_x: width - line.width(), start_x: width - line.width(),
}, },
TextAlignment::Center => TextAlignmentSettings { TextAlignment::Center => TextAlignmentSettings {
space_width: minimum_space_width, space_width: minimum_space_width.into(),
start_x: (width - line.width()) / 2, start_x: (width - line.width()) / 2,
}, },
TextAlignment::Justify => {
let space_width = if line.number_of_spaces() != 0 {
Num::new(
width - line.width() + line.number_of_spaces() as i32 * minimum_space_width,
) / line.number_of_spaces() as i32
} else {
minimum_space_width.into()
};
TextAlignmentSettings {
space_width,
start_x: 0,
}
}
} }
} }
} }
@ -376,7 +390,7 @@ impl LayoutCache {
let width = settings.area.x; let width = settings.area.x;
let line_height = font.line_height(); let line_height = font.line_height();
let mut head_position: Vector2D<i32> = (0, -line_height).into(); let mut head_position: Vector2D<Num<i32, 10>> = (0, -line_height).into();
preprocessed preprocessed
.lines_element(width, minimum_space_width) .lines_element(width, minimum_space_width)
@ -386,7 +400,7 @@ impl LayoutCache {
.settings(&line, minimum_space_width, width); .settings(&line, minimum_space_width, width);
head_position.y += line_height; head_position.y += line_height;
head_position.x = line_settings.start_x; head_position.x = line_settings.start_x.into();
( (
line, line,
@ -394,7 +408,7 @@ impl LayoutCache {
PreprocessedElement::LetterGroup { width } => { PreprocessedElement::LetterGroup { width } => {
let this_position = head_position; let this_position = head_position;
head_position.x += width as i32; head_position.x += width as i32;
Some(this_position) Some(this_position.floor())
} }
PreprocessedElement::WhiteSpace(space) => { PreprocessedElement::WhiteSpace(space) => {
match space { match space {