me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Introduce first-class text module in iced_native

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-10-31 16:13:03 +07:00
parent 0aafcde0ef
commit b3a01973c6
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
16 changed files with 87 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

12
native/src/widget/toggler.rs
View file

@ -6,7 +6,7 @@ use crate::event;
use crate::layout;
use crate::mouse;
use crate::renderer;
use crate::widget::text;
use crate::text;
use crate::widget::{Row, Text};
use crate::{
Alignment, Clipboard, Element, Event, Hasher, Layout, Length, Point,
@ -31,7 +31,7 @@ pub use iced_style::toggler::{Style, StyleSheet};
/// Toggler::new(is_active, String::from("Toggle me!"), |b| Message::TogglerToggled(b));
/// ```
#[allow(missing_debug_implementations)]
pub struct Toggler<Message, Renderer: renderer::Text> {
pub struct Toggler<Message, Renderer: text::Renderer> {
is_active: bool,
on_toggle: Box<dyn Fn(bool) -> Message>,
label: Option<String>,
@ -44,7 +44,7 @@ pub struct Toggler<Message, Renderer: renderer::Text> {
style_sheet: Box<dyn StyleSheet>,
}
impl<Message, Renderer: renderer::Text> Toggler<Message, Renderer> {
impl<Message, Renderer: text::Renderer> Toggler<Message, Renderer> {
/// The default size of a [`Toggler`].
pub const DEFAULT_SIZE: u16 = 20;
@ -126,7 +126,7 @@ impl<Message, Renderer: renderer::Text> Toggler<Message, Renderer> {
impl<Message, Renderer> Widget<Message, Renderer> for Toggler<Message, Renderer>
where
Renderer: renderer::Text,
Renderer: text::Renderer,
{
fn width(&self) -> Length {
self.width
@ -223,7 +223,7 @@ where
if let Some(label) = &self.label {
let label_layout = children.next().unwrap();
text::draw(
crate::widget::text::draw(
renderer,
style,
label_layout,
@ -297,7 +297,7 @@ where
impl<'a, Message, Renderer> From<Toggler<Message, Renderer>>
for Element<'a, Message, Renderer>
where
Renderer: 'a + renderer::Text,
Renderer: 'a + text::Renderer,
Message: 'a,
{
fn from(