leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: specify that lineheight is absolute for heading

Browse source
This commit is contained in:
Ashley Wulber 2023-12-01 15:52:33 -05:00 • committed by Ashley Wulber
parent 0e9b46af72
commit 34e886e2d5
1 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/widget/text.rs
View file

@ -1,5 +1,6 @@
use crate::Renderer; use crate::Renderer;
pub use iced::widget::Text; pub use iced::widget::Text;
use iced_core::text::LineHeight;
use std::borrow::Cow; use std::borrow::Cow;
/// Creates a new [`Text`] widget with the provided content. /// Creates a new [`Text`] widget with the provided content.
@ -27,30 +28,36 @@ pub enum Typography {
pub fn title1<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> { pub fn title1<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> {
Text::new(text) Text::new(text)
.size(32.0) .size(32.0)
.line_height(44.0) .line_height(LineHeight::Absolute(44.0.into()))
.font(crate::font::FONT_LIGHT) .font(crate::font::FONT_LIGHT)
} }
/// [`Text`] widget with the Title 2 typography preset. /// [`Text`] widget with the Title 2 typography preset.
pub fn title2<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> { pub fn title2<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> {
Text::new(text).size(28.0).line_height(36.0) Text::new(text)
.size(28.0)
.line_height(LineHeight::Absolute(36.0.into()))
} }
/// [`Text`] widget with the Title 3 typography preset. /// [`Text`] widget with the Title 3 typography preset.
pub fn title3<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> { pub fn title3<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> {
Text::new(text).size(24.0).line_height(32.0) Text::new(text)
.size(24.0)
.line_height(LineHeight::Absolute(32.0.into()))
} }
/// [`Text`] widget with the Title 4 typography preset. /// [`Text`] widget with the Title 4 typography preset.
pub fn title4<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> { pub fn title4<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> {
Text::new(text).size(20.0).line_height(28.0) Text::new(text)
.size(20.0)
.line_height(LineHeight::Absolute(28.0.into()))
} }
/// [`Text`] widget with the Heading typography preset. /// [`Text`] widget with the Heading typography preset.
pub fn heading<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> { pub fn heading<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> {
Text::new(text) Text::new(text)
.size(14.0) .size(14.0)
.line_height(20.0) .line_height(LineHeight::Absolute(iced::Pixels(20.0)))
.font(crate::font::FONT_SEMIBOLD) .font(crate::font::FONT_SEMIBOLD)
} }
@ -58,24 +65,28 @@ pub fn heading<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> {
pub fn caption_heading<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> { pub fn caption_heading<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> {
Text::new(text) Text::new(text)
.size(10.0) .size(10.0)
.line_height(14.0) .line_height(LineHeight::Absolute(iced::Pixels(14.0)))
.font(crate::font::FONT_SEMIBOLD) .font(crate::font::FONT_SEMIBOLD)
} }
/// [`Text`] widget with the Body typography preset. /// [`Text`] widget with the Body typography preset.
pub fn body<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> { pub fn body<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> {
Text::new(text).size(14.0).line_height(20.0) Text::new(text)
.size(14.0)
.line_height(LineHeight::Absolute(20.0.into()))
} }
/// [`Text`] widget with the Caption typography preset. /// [`Text`] widget with the Caption typography preset.
pub fn caption<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> { pub fn caption<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> {
Text::new(text).size(10.0).line_height(14.0) Text::new(text)
.size(10.0)
.line_height(LineHeight::Absolute(14.0.into()))
} }
/// [`Text`] widget with the Monotext typography preset. /// [`Text`] widget with the Monotext typography preset.
pub fn monotext<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> { pub fn monotext<'a>(text: impl Into<Cow<'a, str>> + 'a) -> Text<'a, Renderer> {
Text::new(text) Text::new(text)
.size(14.0) .size(14.0)
.line_height(20.0) .line_height(LineHeight::Absolute(20.0.into()))
.font(crate::font::FONT_MONO_REGULAR) .font(crate::font::FONT_MONO_REGULAR)
} }