johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

♻️ Rename TextContent::get_width to TextContent::width

Browse Source
This commit is contained in:
Belén Albeza
2025-09-02 15:07:13 +02:00
parent d25f9cd4bd
commit 50b9e8c6e6
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
render-wasm/src/render/text.rs
View File

@@ -19,7 +19,7 @@ pub fn render(
// Width // Width
let paragraph_width = if let crate::shapes::Type::Text(text_content) = &shape.shape_type { let paragraph_width = if let crate::shapes::Type::Text(text_content) = &shape.shape_type {
text_content.get_width() text_content.width()
} else { } else {
shape.width() shape.width()
}; };

2
render-wasm/src/shapes/modifiers.rs
View File

@@ -212,7 +212,7 @@ fn propagate_transform(
transform.post_concat(&resize_transform); transform.post_concat(&resize_transform);
} }
GrowType::AutoWidth => { GrowType::AutoWidth => {
let paragraph_width = content.get_width(); let paragraph_width = content.width();
let mut paragraphs = content.to_paragraphs(None, None, None); let mut paragraphs = content.to_paragraphs(None, None, None);
let height = auto_height(&mut paragraphs, paragraph_width); let height = auto_height(&mut paragraphs, paragraph_width);
let resize_transform = math::resize_matrix( let resize_transform = math::resize_matrix(

11
render-wasm/src/shapes/text.rs
View File

@@ -66,11 +66,6 @@ impl TextContent {
self.bounds = Rect::from_xywh(x, y, w, h); self.bounds = Rect::from_xywh(x, y, w, h);
} }
#[allow(dead_code)]
pub fn width(&self) -> f32 {
self.bounds.width()
}
#[allow(dead_code)] #[allow(dead_code)]
pub fn x(&self) -> f32 { pub fn x(&self) -> f32 {
self.bounds.x() self.bounds.x()
@@ -178,13 +173,13 @@ impl TextContent {
paragraph_group paragraph_group
} }
pub fn get_width(&self) -> f32 { pub fn width(&self) -> f32 {
if self.grow_type() == GrowType::AutoWidth { if self.grow_type() == GrowType::AutoWidth {
let temp_paragraphs = self.to_paragraphs(None, None, None); let temp_paragraphs = self.to_paragraphs(None, None, None);
let mut temp_paragraphs = temp_paragraphs; let mut temp_paragraphs = temp_paragraphs;
auto_width(&mut temp_paragraphs, f32::MAX).ceil() auto_width(&mut temp_paragraphs, f32::MAX).ceil()
} else { } else {
self.width() self.bounds.width()
} }
} }
@@ -197,7 +192,7 @@ impl TextContent {
} }
pub fn visual_bounds(&self) -> (f32, f32) { pub fn visual_bounds(&self) -> (f32, f32) {
let paragraph_width = self.get_width(); let paragraph_width = self.width();
let mut paragraphs = self.to_paragraphs(None, None, None); let mut paragraphs = self.to_paragraphs(None, None, None);
let paragraph_height = auto_height(&mut paragraphs, paragraph_width); let paragraph_height = auto_height(&mut paragraphs, paragraph_width);
(paragraph_width, paragraph_height) (paragraph_width, paragraph_height)

2
render-wasm/src/wasm/text.rs
View File

@@ -43,7 +43,7 @@ pub extern "C" fn get_text_dimensions() -> *mut u8 {
if let Type::Text(content) = &shape.shape_type { if let Type::Text(content) = &shape.shape_type {
// 1. Reset Paragraphs // 1. Reset Paragraphs
let paragraph_width = content.get_width(); let paragraph_width = content.width();
let mut paragraphs = content.to_paragraphs(None, None, None); let mut paragraphs = content.to_paragraphs(None, None, None);
let built_paragraphs = build_paragraphs_with_width(&mut paragraphs, paragraph_width); let built_paragraphs = build_paragraphs_with_width(&mut paragraphs, paragraph_width);