Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement TextRun::metrics_for_range, and text box splitter helper.

Browse source
This commit is contained in:
Brian J. Burg 2012-10-15 17:15:09 -07:00
parent 78cfdee5e8
commit 451828bce0
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/servo/layout/text.rs
View file

@ -26,9 +26,9 @@ pub fn adapt_textbox_with_range(box_data: &RenderBoxData, run: @TextRun,
offset: uint, length: uint) -> @RenderBox { offset: uint, length: uint) -> @RenderBox {
let new_box_data = copy *box_data; let new_box_data = copy *box_data;
let new_text_data = TextBoxData(run, offset, length); let new_text_data = TextBoxData(run, offset, length);
let metrics = run.metrics_for_range(offset, length);
new_box_data.position.size = metrics.bounding_box.size;
@TextBox(move new_box_data, move new_text_data) @TextBox(move new_box_data, move new_text_data)
// TODO: set position based on run metrics
//new_box_data.position.size = { width: run.font
} }
trait UnscannedMethods { trait UnscannedMethods {

7
src/servo/text/text_run.rs
View file

@ -1,7 +1,7 @@
use arc = std::arc; use arc = std::arc;
use arc::ARC; use arc::ARC;
use au = gfx::geometry; use au = gfx::geometry;
use font::Font; use font::{RunMetrics, Font};
use font_cache::FontCache; use font_cache::FontCache;
use geom::point::Point2D; use geom::point::Point2D;
use geom::size::Size2D; use geom::size::Size2D;
@ -49,6 +49,7 @@ trait TextRunMethods {
pure fn glyphs(&self) -> &self/GlyphStore; pure fn glyphs(&self) -> &self/GlyphStore;
pure fn iter_indivisible_pieces_for_range(&self, offset: uint, length: uint, f: fn(uint, uint) -> bool); pure fn iter_indivisible_pieces_for_range(&self, offset: uint, length: uint, f: fn(uint, uint) -> bool);
fn metrics_for_range(offset: uint, length: uint) -> RunMetrics;
fn min_width_for_range(offset: uint, length: uint) -> au; fn min_width_for_range(offset: uint, length: uint) -> au;
fn iter_natural_lines_for_range(&self, offset: uint, length: uint, f: fn(uint, uint) -> bool); fn iter_natural_lines_for_range(&self, offset: uint, length: uint, f: fn(uint, uint) -> bool);
} }
@ -56,6 +57,10 @@ trait TextRunMethods {
impl TextRun : TextRunMethods { impl TextRun : TextRunMethods {
pure fn glyphs(&self) -> &self/GlyphStore { &self.glyphs } pure fn glyphs(&self) -> &self/GlyphStore { &self.glyphs }
fn metrics_for_range(offset: uint, length: uint) -> RunMetrics {
self.font.measure_text(&self, offset, length)
}
fn min_width_for_range(offset: uint, length: uint) -> au { fn min_width_for_range(offset: uint, length: uint) -> au {
assert length > 0; assert length > 0;
assert offset < self.text.len(); assert offset < self.text.len();