Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to set label fonts #785

Merged
merged 2 commits into from
Apr 28, 2020
Merged

Add option to set label fonts #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b36625c
Add option to set label fonts
thecodewarrior Mar 30, 2020
980daf6
Merge remote-tracking branch 'upstream/master' into configurable-labe…
thecodewarrior Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 46 additions & 17 deletions druid/examples/styled_text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,43 @@

//! Example of dynamic text styling

use druid::widget::{Flex, Label, MainAxisAlignment, Painter, Parse, Stepper, TextBox};
use druid::widget::{Checkbox, Flex, Label, MainAxisAlignment, Painter, Parse, Stepper, TextBox};
use druid::{
theme, AppLauncher, Color, Data, Key, Lens, LensExt, LensWrap, LocalizedString, PlatformError,
RenderContext, Widget, WidgetExt, WindowDesc,
};
use std::fmt::Display;

// This is a custom key we'll use with Env to set and get our text size.
const MY_CUSTOM_TEXT_SIZE: Key<f64> = Key::new("styled_text.custom_text_size");
const MY_CUSTOM_FONT: Key<&str> = Key::new("styled_text.custom_font");

#[derive(Clone, Lens, Data)]
struct AppData {
text: String,
size: f64,
mono: bool,
}
impl Display for AppData {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(
f,
"Size {:.1}{}: {}",
self.size,
if self.mono { " mono" } else { "" },
self.text
)
}
}

pub fn main() -> Result<(), PlatformError> {
let main_window = WindowDesc::new(ui_builder).title(
LocalizedString::new("styled-text-demo-window-title").with_placeholder("Type Styler"),
);
let data = AppData {
text: "Here's some sample text".to_string(),
size: 24.0,
mono: false,
};

AppLauncher::with_window(main_window)
Expand All @@ -57,26 +73,35 @@ fn ui_builder() -> impl Widget<AppData> {
});

// This is druid's default text style.
// It's set by theme::LABEL_COLOR and theme::TEXT_SIZE_NORMAL
// It's set by theme::LABEL_COLOR, theme::TEXT_SIZE_NORMAL, and theme::FONT_NAME
let label =
Label::new(|data: &String, _env: &_| format!("Default: {}", data)).lens(AppData::text);

// The text_color and text_size builder methods can override the defaults
// provided by the theme by passing in a Key or a concrete value.
// The text_color, text_size, and font builder methods can override the
// defaults provided by the theme by passing in a Key or a concrete value.
//
// In this example, text_color receives a Key from the theme, while
// text_size gets a custom key which we set with the env_scope wrapper.
let styled_label =
Label::new(|data: &AppData, _env: &_| format!("Size {:.1}: {}", data.size, data.text))
.with_text_color(theme::PRIMARY_LIGHT)
.with_text_size(MY_CUSTOM_TEXT_SIZE)
.background(my_painter)
.on_click(|_, data, _| {
data.size *= 1.1;
})
.env_scope(|env: &mut druid::Env, data: &AppData| {
env.set(MY_CUSTOM_TEXT_SIZE, data.size);
});
// In this example, text_color receives a Key from the theme, text_size
// gets a custom key which we set with the env_scope wrapper, and the
// default font key (theme::FONT_NAME) is overridden in the env_scope
// wrapper. (Like text_color and text_size, the font can be set using the
// with_font builder method, but overriding here makes it easy to fall back
// to the default font)
let styled_label = Label::new(|data: &AppData, _env: &_| format!("{}", data))
.with_text_color(theme::PRIMARY_LIGHT)
.with_text_size(MY_CUSTOM_TEXT_SIZE)
.with_font(MY_CUSTOM_FONT)
.background(my_painter)
.on_click(|_, data, _| {
data.size *= 1.1;
})
.env_scope(|env: &mut druid::Env, data: &AppData| {
env.set(MY_CUSTOM_TEXT_SIZE, data.size);
if data.mono {
env.set(MY_CUSTOM_FONT, "monospace");
} else {
env.set(MY_CUSTOM_FONT, env.get(theme::FONT_NAME).to_string());
}
});

let stepper = Stepper::new()
.with_range(0.0, 100.0)
Expand All @@ -91,6 +116,8 @@ fn ui_builder() -> impl Widget<AppData> {

let stepper_row = Flex::row().with_child(stepper_textbox).with_child(stepper);

let mono_checkbox = Checkbox::new("Monospace").lens(AppData::mono);

let input = TextBox::new().fix_width(200.0).lens(AppData::text);

Flex::column()
Expand All @@ -101,5 +128,7 @@ fn ui_builder() -> impl Widget<AppData> {
.with_spacer(32.0)
.with_child(stepper_row)
.with_spacer(8.0)
.with_child(mono_checkbox)
.with_spacer(8.0)
.with_child(input.padding(5.0))
}
31 changes: 26 additions & 5 deletions druid/src/widget/label.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ pub struct Label<T> {
text: LabelText<T>,
color: KeyOrValue<Color>,
size: KeyOrValue<f64>,
font: KeyOrValue<&'static str>,
}

impl<T: Data> Label<T> {
Expand All @@ -84,6 +85,7 @@ impl<T: Data> Label<T> {
text,
color: theme::LABEL_COLOR.into(),
size: theme::TEXT_SIZE_NORMAL.into(),
font: theme::FONT_NAME.into(),
}
}

Expand Down Expand Up @@ -122,7 +124,7 @@ impl<T: Data> Label<T> {
///
/// The argument can be either a `Color` or a [`Key<Color>`].
///
/// [`Key<Color>`]: struct.Key.html
/// [`Key<Color>`]: ../struct.Key.html
pub fn with_text_color(mut self, color: impl Into<KeyOrValue<Color>>) -> Self {
self.color = color.into();
self
Expand All @@ -132,12 +134,22 @@ impl<T: Data> Label<T> {
///
/// The argument can be either an `f64` or a [`Key<f64>`].
///
/// [`Key<f64>`]: struct.Key.html
/// [`Key<f64>`]: ../struct.Key.html
pub fn with_text_size(mut self, size: impl Into<KeyOrValue<f64>>) -> Self {
self.size = size.into();
self
}

/// Builder-style method for setting the font.
///
/// The argument can be a `&str`, `String`, or [`Key<&str>`].
///
/// [`Key<&str>`]: ../struct.Key.html
pub fn with_font(mut self, font: impl Into<KeyOrValue<&'static str>>) -> Self {
self.font = font.into();
self
}

/// Set a new text.
///
/// Takes an already resolved string as input.
Expand All @@ -160,7 +172,7 @@ impl<T: Data> Label<T> {
///
/// The argument can be either a `Color` or a [`Key<Color>`].
///
/// [`Key<Color>`]: struct.Key.html
/// [`Key<Color>`]: ../struct.Key.html
pub fn set_text_color(&mut self, color: impl Into<KeyOrValue<Color>>) {
self.color = color.into();
}
Expand All @@ -169,13 +181,22 @@ impl<T: Data> Label<T> {
///
/// The argument can be either an `f64` or a [`Key<f64>`].
///
/// [`Key<f64>`]: struct.Key.html
/// [`Key<f64>`]: ../struct.Key.html
pub fn set_text_size(&mut self, size: impl Into<KeyOrValue<f64>>) {
self.size = size.into();
}

/// Set the font.
///
/// The argument can be a `&str`, `String`, or [`Key<&str>`].
///
/// [`Key<&str>`]: ../struct.Key.html
pub fn set_font(&mut self, font: impl Into<KeyOrValue<&'static str>>) {
self.font = font.into();
}

fn get_layout(&mut self, t: &mut PietText, env: &Env) -> PietTextLayout {
let font_name = env.get(theme::FONT_NAME);
let font_name = self.font.resolve(env);
let font_size = self.size.resolve(env);

// TODO: caching of both the format and the layout
Expand Down