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

fix!(widget): rename button function to button::custom

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-09-16 19:11:29 +02:00 • committed by Jeremy Soller
parent 914d989049
commit f12de010ec
15 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/widget/button/icon.rs
View file

@ -1,7 +1,7 @@
// Copyright 2023 System76 <info@system76.com>
// SPDX-License-Identifier: MPL-2.0
use super::{button, Builder, Style};
use super::{Builder, Style};
use crate::widget::{
icon::{self, Handle},
tooltip,
@ -159,7 +159,7 @@ impl<'a, Message: Clone + 'static> From<Button<'a, Message>> for Element<'a, Mes
.padding(builder.padding)
.spacing(builder.spacing)
.align_items(Alignment::Center)
.apply(button)
.apply(super::custom)
} else {
crate::widget::row::with_children(content)
.padding(builder.padding)
@ -167,7 +167,7 @@ impl<'a, Message: Clone + 'static> From<Button<'a, Message>> for Element<'a, Mes
.height(builder.height)
.spacing(builder.spacing)
.align_items(Alignment::Center)
.apply(button)
.apply(super::custom)
};
let button = button

2
src/widget/button/link.rs
View file

@ -82,7 +82,7 @@ impl<'a, Message: Clone + 'static> From<Button<'a, Message>> for Element<'a, Mes
.height(builder.height)
.spacing(builder.spacing)
.align_items(Alignment::Center)
.apply(button)
.apply(button::custom)
.padding(0)
.id(builder.id)
.on_press_maybe(builder.on_press.take())

4
src/widget/button/mod.rs
View file

@ -43,8 +43,8 @@ use iced_core::widget::Id;
use iced_core::{Length, Padding};
use std::borrow::Cow;
/// A button with the default style, which may contain any widget as its content.
pub fn button<'a, Message>(content: impl Into<crate::Element<'a, Message>>) -> Button<'a, Message> {
/// A button with a custom element for its content.
pub fn custom<'a, Message>(content: impl Into<crate::Element<'a, Message>>) -> Button<'a, Message> {
Button::new(content)
}

4
src/widget/button/text.rs
View file

@ -1,7 +1,7 @@
// Copyright 2023 System76 <info@system76.com>
// SPDX-License-Identifier: MPL-2.0
use super::{button, Builder, Style};
use super::{Builder, Style};
use crate::widget::{icon, row, tooltip};
use crate::{ext::CollectionWidget, Element};
use apply::Apply;
@ -124,7 +124,7 @@ impl<'a, Message: Clone + 'static> From<Button<'a, Message>> for Element<'a, Mes
.height(builder.height)
.spacing(builder.spacing)
.align_items(Alignment::Center)
.apply(button)
.apply(super::custom)
.padding(0)
.id(builder.id)
.on_press_maybe(builder.on_press.take())