summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/src/size.rs14
-rw-r--r--core/src/text.rs40
2 files changed, 44 insertions, 10 deletions
diff --git a/core/src/size.rs b/core/src/size.rs
index d7459355..95089236 100644
--- a/core/src/size.rs
+++ b/core/src/size.rs
@@ -99,6 +99,20 @@ impl<T> From<Size<T>> for Vector<T> {
}
}
+impl<T> std::ops::Add for Size<T>
+where
+ T: std::ops::Add<Output = T>,
+{
+ type Output = Size<T>;
+
+ fn add(self, rhs: Self) -> Self::Output {
+ Size {
+ width: self.width + rhs.width,
+ height: self.height + rhs.height,
+ }
+ }
+}
+
impl<T> std::ops::Sub for Size<T>
where
T: std::ops::Sub<Output = T>,
diff --git a/core/src/text.rs b/core/src/text.rs
index d54c8e6c..2f085bd8 100644
--- a/core/src/text.rs
+++ b/core/src/text.rs
@@ -8,7 +8,9 @@ pub use highlighter::Highlighter;
pub use paragraph::Paragraph;
use crate::alignment;
-use crate::{Background, Border, Color, Pixels, Point, Rectangle, Size};
+use crate::{
+ Background, Border, Color, Padding, Pixels, Point, Rectangle, Size,
+};
use std::borrow::Cow;
use std::hash::{Hash, Hasher};
@@ -239,6 +241,10 @@ pub struct Span<'a, Link = (), Font = crate::Font> {
pub link: Option<Link>,
/// The [`Highlight`] of the [`Span`].
pub highlight: Option<Highlight>,
+ /// The [`Padding`] of the [`Span`].
+ ///
+ /// Currently, it only affects the bounds of the [`Highlight`].
+ pub padding: Padding,
}
/// A text highlight.
@@ -261,6 +267,7 @@ impl<'a, Link, Font> Span<'a, Link, Font> {
color: None,
highlight: None,
link: None,
+ padding: Padding::ZERO,
}
}
@@ -300,6 +307,18 @@ impl<'a, Link, Font> Span<'a, Link, Font> {
self
}
+ /// Sets the link of the [`Span`].
+ pub fn link(mut self, link: impl Into<Link>) -> Self {
+ self.link = Some(link.into());
+ self
+ }
+
+ /// Sets the link of the [`Span`], if any.
+ pub fn link_maybe(mut self, link: Option<impl Into<Link>>) -> Self {
+ self.link = link.map(Into::into);
+ self
+ }
+
/// Sets the [`Background`] of the [`Span`].
pub fn background(self, background: impl Into<Background>) -> Self {
self.background_maybe(Some(background))
@@ -355,15 +374,15 @@ impl<'a, Link, Font> Span<'a, Link, Font> {
self
}
- /// Sets the link of the [`Span`].
- pub fn link(mut self, link: impl Into<Link>) -> Self {
- self.link = Some(link.into());
- self
- }
-
- /// Sets the link of the [`Span`], if any.
- pub fn link_maybe(mut self, link: Option<impl Into<Link>>) -> Self {
- self.link = link.map(Into::into);
+ /// Sets the [`Padding`] of the [`Span`].
+ ///
+ /// It only affects the [`background`] and [`border`] of the
+ /// [`Span`], currently.
+ ///
+ /// [`background`]: Self::background
+ /// [`border`]: Self::border
+ pub fn padding(mut self, padding: impl Into<Padding>) -> Self {
+ self.padding = padding.into();
self
}
@@ -377,6 +396,7 @@ impl<'a, Link, Font> Span<'a, Link, Font> {
color: self.color,
link: self.link,
highlight: self.highlight,
+ padding: self.padding,
}
}
}