fnmain/cosmic-jotdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add image support

Browse source
This commit is contained in:
Isaac Mills 2024-04-19 10:47:11 -04:00
parent ee9ff8e2d6
commit dfd8e5d86c
Signed by: fnmain
GPG key ID: B67D7410F33A0F61
1 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/lib.rs
View file

@ -42,7 +42,7 @@ pub struct Indent {
pub indent: f32, pub indent: f32,
} }
pub const INDENT_AMOUNT: f32 = 64.0; pub const INDENT_AMOUNT: f32 = 32.0;
impl<'a, 'b, T: Iterator<Item = Event<'a>>> Iterator for JotdownIntoBuffer<'a, 'b, T> { impl<'a, 'b, T: Iterator<Item = Event<'a>>> Iterator for JotdownIntoBuffer<'a, 'b, T> {
type Item = (&'a str, Attrs<'static>); type Item = (&'a str, Attrs<'static>);
@ -120,6 +120,7 @@ impl<'a, 'b, T: Iterator<Item = Event<'a>>> Iterator for JotdownIntoBuffer<'a, '
modifier: Some(kind), modifier: Some(kind),
}), }),
Container::Image(ref url, _) => { Container::Image(ref url, _) => {
self.added = true;
self.image_url = Some(url.clone()); self.image_url = Some(url.clone());
self.top_level_container.get_or_insert(container); self.top_level_container.get_or_insert(container);
} }
@ -136,7 +137,7 @@ impl<'a, 'b, T: Iterator<Item = Event<'a>>> Iterator for JotdownIntoBuffer<'a, '
Container::List { .. } => { Container::List { .. } => {
self.indent.pop(); self.indent.pop();
} }
Container::Heading { .. } | Container::Paragraph => { Container::Heading { .. } | Container::Paragraph | Container::Image(_, _) => {
if self.added { if self.added {
return None; return None;
} }
@ -229,25 +230,24 @@ pub fn resolve_paragraphs<'a>(
let split = url.0.rsplit_once('.').unwrap(); let split = url.0.rsplit_once('.').unwrap();
let hi_image = format!("{}/{}_hi.{}", base_uri, split.0, split.1); let hi_image = format!("{}/{}_hi.{}", base_uri, split.0, split.1);
buffer.image_urls = Some((image, hi_image)); buffer.image_urls = Some((image, hi_image));
buffer.relative_bounds = Rect::from_min_size( log::info!("{:?}", buffer.image_urls);
Pos2::new(buffer.indent.indent, size.y + margin_top), buffer.relative_bounds =
image_size, Rect::from_min_size(Pos2::new(buffer.indent.indent, size.y), image_size);
);
const IMAGE_PADDING: f32 = 8.0; const IMAGE_PADDING: f32 = 8.0;
if let Some(last_size) = last_image_size.as_mut() { if let Some(last_size) = last_image_size.as_mut() {
let ls = *last_size; let ls = *last_size;
last_size.x += image_size.x + IMAGE_PADDING; last_size.x += image_size.x + IMAGE_PADDING;
if last_size.x > viewbox.x { if last_size.x > viewbox.x {
size.y += last_size.y + margin_top; size.y += last_size.y;
last_size.x = image_size.x + IMAGE_PADDING; last_size.x = image_size.x + IMAGE_PADDING;
last_size.y = image_size.y + margin_top; last_size.y = image_size.y + margin;
buffer.relative_bounds = Rect::from_min_size( buffer.relative_bounds = Rect::from_min_size(
Pos2::new(buffer.indent.indent, size.y + margin_top), Pos2::new(buffer.indent.indent, size.y),
image_size, image_size,
); );
} else { } else {
last_size.y = last_size.y.max(image_size.y + margin_top); last_size.y = last_size.y.max(image_size.y + margin);
buffer.relative_bounds = buffer.relative_bounds =
buffer.relative_bounds.translate(Vec2::new(ls.x, 0.0)); buffer.relative_bounds.translate(Vec2::new(ls.x, 0.0));
} }
@ -255,19 +255,22 @@ pub fn resolve_paragraphs<'a>(
if image_size.x > viewbox.x { if image_size.x > viewbox.x {
let max_size = Vec2::new(viewbox.x, image_size.y); let max_size = Vec2::new(viewbox.x, image_size.y);
let new_size = scale_to_fit(image_size, max_size, true); let new_size = scale_to_fit(image_size, max_size, true);
buffer.relative_bounds = Rect::from_min_size( buffer.relative_bounds =
Pos2::new(buffer.indent.indent, size.y + margin_top), Rect::from_min_size(Pos2::new(buffer.indent.indent, size.y), new_size);
new_size, size.y += new_size.y
);
size.y += new_size.y + margin_top;
} else { } else {
last_image_size = Some(image_size + Vec2::new(IMAGE_PADDING, margin_top)); last_image_size = Some(image_size + Vec2::new(IMAGE_PADDING, margin));
} }
} }
[Some(buffer), None] [Some(buffer), None]
} else if let Some(mut list_kind) = buffer.indent.modifier { } else if let Some(mut list_kind) = buffer.indent.modifier {
if let Some(image_size) = last_image_size { if let Some(image_size) = last_image_size {
size.y += image_size.y; size.y += image_size.y;
buffer.relative_bounds = buffer
.relative_bounds
.translate(Vec2::new(0.0, image_size.y));
size.x = size.x.max(image_size.x);
last_image_size = None;
} }
if let ListKind::Ordered { start, .. } = &mut list_kind { if let ListKind::Ordered { start, .. } = &mut list_kind {
@ -297,7 +300,7 @@ pub fn resolve_paragraphs<'a>(
let list_buffer_metrics = buffer.metrics; let list_buffer_metrics = buffer.metrics;
let indent = (buffer_indent) - (INDENT_AMOUNT * factor); let indent = (buffer_indent) - (INDENT_AMOUNT * factor);
[ let res = [
Some(buffer), Some(buffer),
Some(ResolvedJotdownItem { Some(ResolvedJotdownItem {
indent: Indent { indent: Indent {
@ -314,20 +317,30 @@ pub fn resolve_paragraphs<'a>(
url_map: None, url_map: None,
image_urls: None, image_urls: None,
}), }),
] ];
} else {
if let Some(image_size) = last_image_size {
size.y += image_size.y;
}
in_list = false;
[Some(buffer), None]
};
size.y += buffer_size.y + (margin_top + margin); size.y += buffer_size.y + (margin_top + margin);
last_margin = margin; last_margin = margin;
first = false; first = false;
size.x = size.x.max(buffer_size.x + buffer_indent); size.x = size.x.max(buffer_size.x + buffer_indent);
res
} else {
if let Some(image_size) = last_image_size {
size.y += image_size.y;
buffer.relative_bounds = buffer
.relative_bounds
.translate(Vec2::new(0.0, image_size.y));
size.x = size.x.max(image_size.x);
last_image_size = None;
}
in_list = false;
size.y += buffer_size.y + (margin_top + margin);
last_margin = margin;
first = false;
size.x = size.x.max(buffer_size.x + buffer_indent);
[Some(buffer), None]
};
result_buffers result_buffers
}) })